diff options
| author |  Arnd Bergmann <arnd@arndb.de>
| 2023-11-06 10:44:55 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de>
| 2023-11-23 11:32:31 +0100 |
| commit | f717a8d1643d6515c7179cf32408f7d5a0e2e33b (patch) | |
| tree | 7e99b0e9b83824d1e3ba806dbe3b4ccbba05f407 /arch/x86 | |
| parent | arch: fix asm-offsets.c building with -Wmissing-prototypes (diff) | |
| download | linux-f717a8d1643d6515c7179cf32408f7d5a0e2e33b.tar.gz linux-f717a8d1643d6515c7179cf32408f7d5a0e2e33b.tar.bz2 linux-f717a8d1643d6515c7179cf32408f7d5a0e2e33b.zip | |
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>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/traps.h | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/traps.c | 1 |
2 files changed, 1 insertions, 1 deletions
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> |