| Message ID | 20231108125843.3806765-11-arnd@kernel.org (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | -Wmissing-prototype warning fixes | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
Hi Arnd, On Wed, Nov 8, 2023 at 2:01 PM Arnd Bergmann <arnd@kernel.org> wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Microblaze runs into a single -Wmissing-prototypes warning when that is > enabled: > > arch/microblaze/kernel/traps.c:21:6: warning: no previous prototype for 'trap_init' [-Wmissing-prototypes] > > Include the right header to avoid this. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Thanks for your patch! > arch/alpha/kernel/traps.c | 1 + > arch/csky/include/asm/traps.h | 2 -- > arch/csky/kernel/traps.c | 1 + > arch/m68k/coldfire/vectors.c | 3 +-- > arch/m68k/coldfire/vectors.h | 3 --- Ah, so this is where the m68k changes listed in the cover letter are hiding ;-) > arch/microblaze/kernel/traps.c | 1 + > arch/sparc/kernel/traps_32.c | 1 + > arch/sparc/kernel/traps_64.c | 1 + > arch/x86/include/asm/traps.h | 1 - > arch/x86/kernel/traps.c | 1 + > 10 files changed, 7 insertions(+), 8 deletions(-) > delete mode 100644 arch/m68k/coldfire/vectors.h Obviously the non-microblaze changes should be spun off in separate patches. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Wed, Nov 8, 2023, at 21:42, Geert Uytterhoeven wrote: > > On Wed, Nov 8, 2023 at 2:01 PM Arnd Bergmann <arnd@kernel.org> wrote: >> From: Arnd Bergmann <arnd@arndb.de> >> >> Microblaze runs into a single -Wmissing-prototypes warning when that is >> enabled: >> >> arch/microblaze/kernel/traps.c:21:6: warning: no previous prototype for 'trap_init' [-Wmissing-prototypes] >> >> Include the right header to avoid this. >> >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Thanks for your patch! > >> arch/alpha/kernel/traps.c | 1 + >> arch/csky/include/asm/traps.h | 2 -- >> arch/csky/kernel/traps.c | 1 + >> arch/m68k/coldfire/vectors.c | 3 +-- >> arch/m68k/coldfire/vectors.h | 3 --- > > Ah, so this is where the m68k changes listed in the cover letter are > hiding ;-) > >> arch/microblaze/kernel/traps.c | 1 + >> arch/sparc/kernel/traps_32.c | 1 + >> arch/sparc/kernel/traps_64.c | 1 + >> arch/x86/include/asm/traps.h | 1 - >> arch/x86/kernel/traps.c | 1 + >> 10 files changed, 7 insertions(+), 8 deletions(-) >> delete mode 100644 arch/m68k/coldfire/vectors.h > > Obviously the non-microblaze changes should be spun off in separate > patches. I messed up one of my rebases here and accidentally sent the wrong changelog text. My intention was to have the combined patch but with this text: arch: include linux/cpu.h for trap_init() prototype some architectures run into a -Wmissing-prototypes warning for trap_init() arch/microblaze/kernel/traps.c:21:6: warning: no previous prototype for 'trap_init' [-Wmissing-prototypes] Include the right header to avoid this consistently, removing the extra declarations on m68k and x86 that were added as local workarounds already. Signed-off-by: Arnd Bergmann <arnd@arndb.de> I made the same mistake with the "arch: add do_page_fault prototypes" patch that was missing an explanation. Arnd
Hi Arnd, On Wed, Nov 8, 2023 at 10:07 PM Arnd Bergmann <arnd@arndb.de> wrote: > On Wed, Nov 8, 2023, at 21:42, Geert Uytterhoeven wrote: > > On Wed, Nov 8, 2023 at 2:01 PM Arnd Bergmann <arnd@kernel.org> wrote: > >> From: Arnd Bergmann <arnd@arndb.de> > >> > >> Microblaze runs into a single -Wmissing-prototypes warning when that is > >> enabled: > >> > >> arch/microblaze/kernel/traps.c:21:6: warning: no previous prototype for 'trap_init' [-Wmissing-prototypes] > >> > >> Include the right header to avoid this. > >> > >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > > > Thanks for your patch! > > > >> arch/alpha/kernel/traps.c | 1 + > >> arch/csky/include/asm/traps.h | 2 -- > >> arch/csky/kernel/traps.c | 1 + > >> arch/m68k/coldfire/vectors.c | 3 +-- > >> arch/m68k/coldfire/vectors.h | 3 --- > > > > Ah, so this is where the m68k changes listed in the cover letter are > > hiding ;-) > > > >> arch/microblaze/kernel/traps.c | 1 + > >> arch/sparc/kernel/traps_32.c | 1 + > >> arch/sparc/kernel/traps_64.c | 1 + > >> arch/x86/include/asm/traps.h | 1 - > >> arch/x86/kernel/traps.c | 1 + > >> 10 files changed, 7 insertions(+), 8 deletions(-) > >> delete mode 100644 arch/m68k/coldfire/vectors.h > > > > Obviously the non-microblaze changes should be spun off in separate > > patches. > > I messed up one of my rebases here and accidentally sent > the wrong changelog text. My intention was to have the > combined patch but with this text: > > arch: include linux/cpu.h for trap_init() prototype > > some architectures run into a -Wmissing-prototypes warning > for trap_init() > > arch/microblaze/kernel/traps.c:21:6: warning: no previous prototype for 'trap_init' [-Wmissing-prototypes] > > Include the right header to avoid this consistently, removing > the extra declarations on m68k and x86 that were added as local > workarounds already. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> That makes sense, although it's hard to combine this with "my preference would be for the patches to make it through the respective subsystem maintainer trees"... Gr{oetje,eeting}s, Geert
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c index d9a67b370e04..7fc72aeb7398 100644 --- a/arch/alpha/kernel/traps.c +++ b/arch/alpha/kernel/traps.c @@ -9,6 +9,7 @@ * This file initializes the trap entry points */ +#include <linux/cpu.h> #include <linux/jiffies.h> #include <linux/mm.h> #include <linux/sched/signal.h> diff --git a/arch/csky/include/asm/traps.h b/arch/csky/include/asm/traps.h index 732c4aaa2e26..495ce318d569 100644 --- a/arch/csky/include/asm/traps.h +++ b/arch/csky/include/asm/traps.h @@ -55,6 +55,4 @@ asmlinkage void trap_c(struct pt_regs *regs); asmlinkage void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags); -void trap_init(void); - #endif /* __ASM_CSKY_TRAPS_H */ diff --git a/arch/csky/kernel/traps.c b/arch/csky/kernel/traps.c index 6e426fba0119..c2246b07cc9c 100644 --- a/arch/csky/kernel/traps.c +++ b/arch/csky/kernel/traps.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd. +#include <linux/cpu.h> #include <linux/sched.h> #include <linux/signal.h> #include <linux/kernel.h> diff --git a/arch/m68k/coldfire/vectors.c b/arch/m68k/coldfire/vectors.c index c26c255b530d..4321fd89d83e 100644 --- a/arch/m68k/coldfire/vectors.c +++ b/arch/m68k/coldfire/vectors.c @@ -12,14 +12,13 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/irq.h> +#include <linux/cpu.h> #include <asm/traps.h> #include <asm/machdep.h> #include <asm/coldfire.h> #include <asm/mcfsim.h> #include <asm/mcfwdebug.h> -#include "vectors.h" - /***************************************************************************/ #ifdef TRAP_DBG_INTERRUPT diff --git a/arch/m68k/coldfire/vectors.h b/arch/m68k/coldfire/vectors.h deleted file mode 100644 index 0b01450a4353..000000000000 --- a/arch/m68k/coldfire/vectors.h +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -void trap_init(void); diff --git a/arch/microblaze/kernel/traps.c b/arch/microblaze/kernel/traps.c index 94b6fe93147d..080aa769218d 100644 --- a/arch/microblaze/kernel/traps.c +++ b/arch/microblaze/kernel/traps.c @@ -8,6 +8,7 @@ * for more details. */ +#include <linux/cpu.h> #include <linux/export.h> #include <linux/kernel.h> #include <linux/kallsyms.h> diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c index 179aabfa712e..bb149f6cc34b 100644 --- a/arch/sparc/kernel/traps_32.c +++ b/arch/sparc/kernel/traps_32.c @@ -10,6 +10,7 @@ * I hate traps on the sparc, grrr... */ +#include <linux/cpu.h> #include <linux/sched/mm.h> #include <linux/sched/debug.h> #include <linux/mm_types.h> diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c index 08ffd17d5ec3..3631899f2394 100644 --- a/arch/sparc/kernel/traps_64.c +++ b/arch/sparc/kernel/traps_64.c @@ -9,6 +9,7 @@ * I like traps on v9, :)))) */ +#include <linux/cpu.h> #include <linux/extable.h> #include <linux/sched/mm.h> #include <linux/sched/debug.h> diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h index b1c9cea6ba88..1f1deaecd364 100644 --- a/arch/x86/include/asm/traps.h +++ b/arch/x86/include/asm/traps.h @@ -14,7 +14,6 @@ asmlinkage __visible notrace struct pt_regs *sync_regs(struct pt_regs *eregs); asmlinkage __visible notrace struct pt_regs *fixup_bad_iret(struct pt_regs *bad_regs); -void __init trap_init(void); asmlinkage __visible noinstr struct pt_regs *vc_switch_off_ist(struct pt_regs *eregs); #endif diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index c876f1d36a81..b0737a15c470 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -37,6 +37,7 @@ #include <linux/nmi.h> #include <linux/mm.h> #include <linux/smp.h> +#include <linux/cpu.h> #include <linux/io.h> #include <linux/hardirq.h> #include <linux/atomic.h>