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/sparc | |
| parent | d67a308ac5de5b24b678ee90759a3b2e4283c11e (diff) | |
| parent | 7192ad2adde8213ad7c7f3b1ff974cccebae4d60 (diff) | |
| download | linux-0734f5c7eb15f9d3bbdacffe501eabdb8b1c01d2.tar.gz linux-0734f5c7eb15f9d3bbdacffe501eabdb8b1c01d2.tar.bz2 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/sparc')
| -rw-r--r-- | arch/sparc/kernel/asm-offsets.c | 6 | ||||
| -rw-r--r-- | arch/sparc/kernel/traps_32.c | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/traps_64.c | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/arch/sparc/kernel/asm-offsets.c b/arch/sparc/kernel/asm-offsets.c index 5784f2df489a..3d9b9855dce9 100644 --- a/arch/sparc/kernel/asm-offsets.c +++ b/arch/sparc/kernel/asm-offsets.c @@ -19,14 +19,14 @@ #include <asm/hibernate.h> #ifdef CONFIG_SPARC32 -int sparc32_foo(void) +static int __used sparc32_foo(void) { DEFINE(AOFF_thread_fork_kpsr, offsetof(struct thread_struct, fork_kpsr)); return 0; } #else -int sparc64_foo(void) +static int __used sparc64_foo(void) { #ifdef CONFIG_HIBERNATION BLANK(); @@ -45,7 +45,7 @@ int sparc64_foo(void) } #endif -int foo(void) +static int __used foo(void) { BLANK(); DEFINE(AOFF_task_thread, offsetof(struct task_struct, thread)); 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> |