Skip to content

Commit 8b273a5

Browse files
andreas-gaislermehmetb0
authored andcommitted
sparc64: Fix incorrect function signature and add prototype for prom_cif_init
BugLink: https://bugs.launchpad.net/bugs/2083196 [ Upstream commit a6c3ea1ec96307dbfbb2f16d96c674c5cc80f445 ] Remove the unused cif_stack argument and add a protype in oplib_64.h Commit ef3e035 ("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: ef3e035 ("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> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Portia Stephens <portia.stephens@canonical.com> Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
1 parent 0816c26 commit 8b273a5

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

arch/sparc/include/asm/oplib_64.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ void prom_sun4v_guest_soft_state(void);
247247
int prom_ihandle2path(int handle, char *buffer, int bufsize);
248248

249249
/* Client interface level routines. */
250+
void prom_cif_init(void *cif_handler);
250251
void p1275_cmd_direct(unsigned long *);
251252

252253
#endif /* !(__SPARC64_OPLIB_H) */

arch/sparc/prom/init_64.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ phandle prom_chosen_node;
2626
* routines in the prom library.
2727
* It gets passed the pointer to the PROM vector.
2828
*/
29-
30-
extern void prom_cif_init(void *);
31-
3229
void __init prom_init(void *cif_handler)
3330
{
3431
phandle node;

arch/sparc/prom/p1275.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void p1275_cmd_direct(unsigned long *args)
4949
local_irq_restore(flags);
5050
}
5151

52-
void prom_cif_init(void *cif_handler, void *cif_stack)
52+
void prom_cif_init(void *cif_handler)
5353
{
5454
p1275buf.prom_cif_handler = (void (*)(long *))cif_handler;
5555
}

0 commit comments

Comments
 (0)