diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2023-11-28 18:25:37 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-11-28 18:25:37 +0100 |
| commit | 0734f5c7eb15f9d3bbdacffe501eabdb8b1c01d2 (patch) | |
| tree | f166bc0686fd6b6376f81885c9d9f7288f86f7d8 /arch/m68k | |
| parent | Merge branch 'asm-generic-io.h-cleanup' into asm-generic (diff) | |
| parent | arm64: vdso32: Define BUILD_VDSO32_64 to correct prototypes (diff) | |
| download | wireguard-linux-0734f5c7eb15f9d3bbdacffe501eabdb8b1c01d2.tar.xz wireguard-linux-0734f5c7eb15f9d3bbdacffe501eabdb8b1c01d2.zip | |
Merge branch 'asm-generic-prototypes' into asm-generic
As part of my quest to enable -Wmissing-prototypes by default,
these patches clean up some of the prototypes that are needed by all
architectures but are handled inconsistently.
The duplicate prototypes are moved into common code, which helps both
to clean up the existing warnings and simplifies the logic.
* asm-generic-prototypes:
arm64: vdso32: Define BUILD_VDSO32_64 to correct prototypes
csky: fix arch_jump_label_transform_static override
arch: add do_page_fault prototypes
arch: add missing prepare_ftrace_return() prototypes
arch: vdso: consolidate gettime prototypes
arch: include linux/cpu.h for trap_init() prototype
arch: fix asm-offsets.c building with -Wmissing-prototypes
arch: consolidate arch_irq_work_raise prototypes
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/coldfire/vectors.c | 3 | ||||
| -rw-r--r-- | arch/m68k/coldfire/vectors.h | 3 |
2 files changed, 1 insertions, 5 deletions
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); |