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/alpha | |
| parent | d67a308ac5de5b24b678ee90759a3b2e4283c11e (diff) | |
| parent | 7192ad2adde8213ad7c7f3b1ff974cccebae4d60 (diff) | |
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/alpha')
| -rw-r--r-- | arch/alpha/include/asm/mmu_context.h | 2 | ||||
| -rw-r--r-- | arch/alpha/kernel/asm-offsets.c | 2 | ||||
| -rw-r--r-- | arch/alpha/kernel/traps.c | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/mmu_context.h b/arch/alpha/include/asm/mmu_context.h index 4eea7c616992..29a3e3a1f02b 100644 --- a/arch/alpha/include/asm/mmu_context.h +++ b/arch/alpha/include/asm/mmu_context.h @@ -183,6 +183,8 @@ ev4_switch_mm(struct mm_struct *prev_mm, struct mm_struct *next_mm, } extern void __load_new_mm_context(struct mm_struct *); +asmlinkage void do_page_fault(unsigned long address, unsigned long mmcsr, + long cause, struct pt_regs *regs); #ifdef CONFIG_SMP #define check_mmu_context() \ diff --git a/arch/alpha/kernel/asm-offsets.c b/arch/alpha/kernel/asm-offsets.c index b121294bee26..bf1eedd27cf7 100644 --- a/arch/alpha/kernel/asm-offsets.c +++ b/arch/alpha/kernel/asm-offsets.c @@ -12,7 +12,7 @@ #include <linux/kbuild.h> #include <asm/io.h> -void foo(void) +static void __used foo(void) { DEFINE(TI_TASK, offsetof(struct thread_info, task)); DEFINE(TI_FLAGS, offsetof(struct thread_info, flags)); 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> |