Skip to content

Commit f3cac4f

Browse files
nathanchancetsbogend
authored andcommitted
MIPS: Add prototypes for plat_post_relocation() and relocate_kernel()
When building malta_defconfig with CONFIG_RELOCATABLE=y, there are two warnings due to missing prototypes for functions only used when that configuration is enabled: arch/mips/kernel/relocate.c:42:12: warning: no previous prototype for 'plat_post_relocation' [-Wmissing-prototypes] 42 | int __weak plat_post_relocation(long offset) | ^~~~~~~~~~~~~~~~~~~~ arch/mips/kernel/relocate.c:324:14: warning: no previous prototype for 'relocate_kernel' [-Wmissing-prototypes] 324 | void *__init relocate_kernel(void) | ^~~~~~~~~~~~~~~ While relocate_kernel() is only called from assembly, it makes sense to keep the prototypes together in C to fix the warnings. Add them to silence the warnings. Signed-off-by: Nathan Chancellor <[email protected]> Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent 29b83a6 commit f3cac4f

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

arch/mips/include/asm/setup.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#ifndef _MIPS_SETUP_H
33
#define _MIPS_SETUP_H
44

5+
#include <linux/init.h>
56
#include <linux/types.h>
67
#include <uapi/asm/setup.h>
78

@@ -29,4 +30,9 @@ extern void per_cpu_trap_init(bool);
2930
extern void cpu_cache_init(void);
3031
extern void tlb_init(void);
3132

33+
#ifdef CONFIG_RELOCATABLE
34+
extern void * __init relocate_kernel(void);
35+
extern int plat_post_relocation(long);
36+
#endif
37+
3238
#endif /* __SETUP_H */

0 commit comments

Comments
 (0)