summaryrefslogtreecommitdiffstats
path: root/arch/sparc/prom
diff options
context:
space:
mode:
authorAndreas Larsson <andreas@gaisler.com>2024-07-10 11:41:53 +0200
committerAndreas Larsson <andreas@gaisler.com>2024-07-11 15:58:28 +0200
commita6c3ea1ec96307dbfbb2f16d96c674c5cc80f445 (patch)
tree8fed16a501a39839a090acbb4354fe4c6373af45 /arch/sparc/prom
parent4c207db87d003c0dd1c59e41b355ab0a14f7a445 (diff)
downloadlinux-stable-a6c3ea1ec96307dbfbb2f16d96c674c5cc80f445.tar.gz
linux-stable-a6c3ea1ec96307dbfbb2f16d96c674c5cc80f445.tar.bz2
linux-stable-a6c3ea1ec96307dbfbb2f16d96c674c5cc80f445.zip
sparc64: Fix incorrect function signature and add prototype for prom_cif_init
Remove the unused cif_stack argument and add a protype in oplib_64.h Commit ef3e035c3a9b ("sparc64: Fix register corruption in top-most kernel stack frame during boot.") removed the cif_stack argument to prom_cif init in the declaration at the caller site and the usage of it within prom_cif_init, but not in the function signature of the function itself. This also fixes the following warning: arch/sparc/prom/p1275.c:52:6: warning: no previous prototype for ‘prom_cif_init’ Fixes: ef3e035c3a9b ("sparc64: Fix register corruption in top-most kernel stack frame during boot.") Link: https://lore.kernel.org/r/20240710094155.458731-3-andreas@gaisler.com Signed-off-by: Andreas Larsson <andreas@gaisler.com>
Diffstat (limited to 'arch/sparc/prom')
-rw-r--r--arch/sparc/prom/init_64.c3
-rw-r--r--arch/sparc/prom/p1275.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/sparc/prom/init_64.c b/arch/sparc/prom/init_64.c
index 103aa9104318..f7b8a1a865b8 100644
--- a/arch/sparc/prom/init_64.c
+++ b/arch/sparc/prom/init_64.c
@@ -26,9 +26,6 @@ phandle prom_chosen_node;
* routines in the prom library.
* It gets passed the pointer to the PROM vector.
*/
-
-extern void prom_cif_init(void *);
-
void __init prom_init(void *cif_handler)
{
phandle node;
diff --git a/arch/sparc/prom/p1275.c b/arch/sparc/prom/p1275.c
index 889aa602f8d8..51c3f984bbf7 100644
--- a/arch/sparc/prom/p1275.c
+++ b/arch/sparc/prom/p1275.c
@@ -49,7 +49,7 @@ void p1275_cmd_direct(unsigned long *args)
local_irq_restore(flags);
}
-void prom_cif_init(void *cif_handler, void *cif_stack)
+void prom_cif_init(void *cif_handler)
{
p1275buf.prom_cif_handler = (void (*)(long *))cif_handler;
}