summaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2023-11-28 18:25:37 +0100
committerArnd Bergmann <arnd@arndb.de>2023-11-28 18:25:37 +0100
commit0734f5c7eb15f9d3bbdacffe501eabdb8b1c01d2 (patch)
treef166bc0686fd6b6376f81885c9d9f7288f86f7d8 /arch/sh
parentMerge branch 'asm-generic-io.h-cleanup' into asm-generic (diff)
parentarm64: vdso32: Define BUILD_VDSO32_64 to correct prototypes (diff)
downloadlinux-0734f5c7eb15f9d3bbdacffe501eabdb8b1c01d2.tar.xz
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/sh')
-rw-r--r--arch/sh/include/asm/traps_32.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sh/include/asm/traps_32.h b/arch/sh/include/asm/traps_32.h
index 8c5bbb7b6053..8f14071bea72 100644
--- a/arch/sh/include/asm/traps_32.h
+++ b/arch/sh/include/asm/traps_32.h
@@ -43,6 +43,9 @@ static inline void trigger_address_error(void)
asmlinkage void do_address_error(struct pt_regs *regs,
unsigned long writeaccess,
unsigned long address);
+asmlinkage void do_page_fault(struct pt_regs *regs,
+ unsigned long error_code,
+ unsigned long address);
asmlinkage void do_divide_error(unsigned long r4);
asmlinkage void do_reserved_inst(void);
asmlinkage void do_illegal_slot_inst(void);