| Message ID | 20180225172236.29650-22-malat@debian.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e82d70cf965072a3872ea97b7d8df4b6f29fc09f |
| Headers | show |
| Series | powerpc/gamecube: make W=1 compilation errors free | expand |
Mathieu Malaterre <malat@debian.org> writes: > This commit add the prototypes for the following function: > > - early_init > - machine_init I'd rather these were in asm-prototypes.h, it's the header for functions called from asm. I made that change. > - ppc_setup_l2cr > - ppc_setup_l3cr > - ppc_init These three can just be static. So I did that. cheers
On Sun, 2018-02-25 at 17:22:36 UTC, Mathieu Malaterre wrote: > This commit add the prototypes for the following function: > > - early_init > - machine_init > - ppc_setup_l2cr > - ppc_setup_l3cr > - ppc_init > > the other missing ones were already added in setup.h previously. Fix the > following warnings (treated as error in W=1): > > AR init/built-in.o > arch/powerpc/kernel/setup_32.c:68:30: error: no previous prototype for ‘early_init’ [-Werror=missing-prototypes] > notrace unsigned long __init early_init(unsigned long dt_ptr) > ^~~~~~~~~~ > arch/powerpc/kernel/setup_32.c:99:21: error: no previous prototype for ‘machine_init’ [-Werror=missing-prototypes] > notrace void __init machine_init(u64 dt_ptr) > ^~~~~~~~~~~~ > arch/powerpc/kernel/setup_32.c:124:12: error: no previous prototype for ‘ppc_setup_l2cr’ [-Werror=missing-prototypes] > int __init ppc_setup_l2cr(char *str) > ^~~~~~~~~~~~~~ > arch/powerpc/kernel/setup_32.c:137:12: error: no previous prototype for ‘ppc_setup_l3cr’ [-Werror=missing-prototypes] > int __init ppc_setup_l3cr(char *str) > ^~~~~~~~~~~~~~ > arch/powerpc/kernel/setup_32.c:183:12: error: no previous prototype for ‘ppc_init’ [-Werror=missing-prototypes] > int __init ppc_init(void) > ^~~~~~~~ > arch/powerpc/kernel/setup_32.c:198:13: error: no previous prototype for ‘irqstack_early_init’ [-Werror=missing-prototypes] > void __init irqstack_early_init(void) > ^~~~~~~~~~~~~~~~~~~ > arch/powerpc/kernel/setup_32.c:238:13: error: no previous prototype for ‘setup_power_save’ [-Werror=missing-prototypes] > void __init setup_power_save(void) > ^~~~~~~~~~~~~~~~ > arch/powerpc/kernel/setup_32.c:253:13: error: no previous prototype for ‘initialize_cache_info’ [-Werror=missing-prototypes] > __init void initialize_cache_info(void) > ^~~~~~~~~~~~~~~~~~~~~ > cc1: all warnings being treated as errors > > Signed-off-by: Mathieu Malaterre <malat@debian.org> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/e82d70cf965072a3872ea97b7d8df4 cheers
diff --git a/arch/powerpc/kernel/setup.h b/arch/powerpc/kernel/setup.h index 3fc11e30308f..d768023a04bd 100644 --- a/arch/powerpc/kernel/setup.h +++ b/arch/powerpc/kernel/setup.h @@ -17,6 +17,11 @@ void irqstack_early_init(void); #ifdef CONFIG_PPC32 void setup_power_save(void); +unsigned long __init early_init(unsigned long dt_ptr); +void __init machine_init(u64 dt_ptr); +int __init ppc_setup_l2cr(char *str); +int __init ppc_setup_l3cr(char *str); +int __init ppc_init(void); #else static inline void setup_power_save(void) { }; #endif diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 51ebc01fff52..12bcab77a29f 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c @@ -40,6 +40,8 @@ #include <asm/code-patching.h> #include <asm/cpu_has_feature.h> +#include "setup.h" + #define DBG(fmt...) extern void bootx_init(unsigned long r4, unsigned long phys);
This commit add the prototypes for the following function: - early_init - machine_init - ppc_setup_l2cr - ppc_setup_l3cr - ppc_init the other missing ones were already added in setup.h previously. Fix the following warnings (treated as error in W=1): AR init/built-in.o arch/powerpc/kernel/setup_32.c:68:30: error: no previous prototype for ‘early_init’ [-Werror=missing-prototypes] notrace unsigned long __init early_init(unsigned long dt_ptr) ^~~~~~~~~~ arch/powerpc/kernel/setup_32.c:99:21: error: no previous prototype for ‘machine_init’ [-Werror=missing-prototypes] notrace void __init machine_init(u64 dt_ptr) ^~~~~~~~~~~~ arch/powerpc/kernel/setup_32.c:124:12: error: no previous prototype for ‘ppc_setup_l2cr’ [-Werror=missing-prototypes] int __init ppc_setup_l2cr(char *str) ^~~~~~~~~~~~~~ arch/powerpc/kernel/setup_32.c:137:12: error: no previous prototype for ‘ppc_setup_l3cr’ [-Werror=missing-prototypes] int __init ppc_setup_l3cr(char *str) ^~~~~~~~~~~~~~ arch/powerpc/kernel/setup_32.c:183:12: error: no previous prototype for ‘ppc_init’ [-Werror=missing-prototypes] int __init ppc_init(void) ^~~~~~~~ arch/powerpc/kernel/setup_32.c:198:13: error: no previous prototype for ‘irqstack_early_init’ [-Werror=missing-prototypes] void __init irqstack_early_init(void) ^~~~~~~~~~~~~~~~~~~ arch/powerpc/kernel/setup_32.c:238:13: error: no previous prototype for ‘setup_power_save’ [-Werror=missing-prototypes] void __init setup_power_save(void) ^~~~~~~~~~~~~~~~ arch/powerpc/kernel/setup_32.c:253:13: error: no previous prototype for ‘initialize_cache_info’ [-Werror=missing-prototypes] __init void initialize_cache_info(void) ^~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors Signed-off-by: Mathieu Malaterre <malat@debian.org> --- arch/powerpc/kernel/setup.h | 5 +++++ arch/powerpc/kernel/setup_32.c | 2 ++ 2 files changed, 7 insertions(+)