| Message ID | 20230810141947.1236730-15-arnd@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | -Wmissing-prototype warning fixes | expand |
On Thu, 10 Aug 2023 16:19:32 +0200 Arnd Bergmann <arnd@kernel.org> wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Most architectures that support kprobes declare this function in their > own asm/kprobes.h header and provide an override, but some are missing > the prototype, which causes a warning for the __weak stub implementation: > > kernel/kprobes.c:1865:12: error: no previous prototype for 'kprobe_exceptions_notify' [-Werror=missing-prototypes] > 1865 | int __weak kprobe_exceptions_notify(struct notifier_block *self, > > Move the prototype into linux/kprobes.h so it is visible to all > the definitions. Good catch! and it seems x86 has no implementation, so this is more resonable. Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Thank you, > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > arch/arc/include/asm/kprobes.h | 3 --- > arch/arm/include/asm/kprobes.h | 2 -- > arch/arm64/include/asm/kprobes.h | 2 -- > arch/ia64/include/asm/kprobes.h | 2 -- > arch/mips/include/asm/kprobes.h | 2 -- > arch/powerpc/include/asm/kprobes.h | 2 -- > arch/s390/include/asm/kprobes.h | 2 -- > arch/sh/include/asm/kprobes.h | 2 -- > arch/sparc/include/asm/kprobes.h | 2 -- > arch/x86/include/asm/kprobes.h | 2 -- > include/linux/kprobes.h | 4 ++++ > 11 files changed, 4 insertions(+), 21 deletions(-) > > diff --git a/arch/arc/include/asm/kprobes.h b/arch/arc/include/asm/kprobes.h > index de1566e32cb89..68e8301c0df2c 100644 > --- a/arch/arc/include/asm/kprobes.h > +++ b/arch/arc/include/asm/kprobes.h > @@ -32,9 +32,6 @@ struct kprobe; > > void arch_remove_kprobe(struct kprobe *p); > > -int kprobe_exceptions_notify(struct notifier_block *self, > - unsigned long val, void *data); > - > struct prev_kprobe { > struct kprobe *kp; > unsigned long status; > diff --git a/arch/arm/include/asm/kprobes.h b/arch/arm/include/asm/kprobes.h > index e26a278d301ab..5b8dbf1b0be49 100644 > --- a/arch/arm/include/asm/kprobes.h > +++ b/arch/arm/include/asm/kprobes.h > @@ -40,8 +40,6 @@ struct kprobe_ctlblk { > > void arch_remove_kprobe(struct kprobe *); > int kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr); > -int kprobe_exceptions_notify(struct notifier_block *self, > - unsigned long val, void *data); > > /* optinsn template addresses */ > extern __visible kprobe_opcode_t optprobe_template_entry[]; > diff --git a/arch/arm64/include/asm/kprobes.h b/arch/arm64/include/asm/kprobes.h > index 05cd82eeca136..be7a3680dadff 100644 > --- a/arch/arm64/include/asm/kprobes.h > +++ b/arch/arm64/include/asm/kprobes.h > @@ -37,8 +37,6 @@ struct kprobe_ctlblk { > > void arch_remove_kprobe(struct kprobe *); > int kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr); > -int kprobe_exceptions_notify(struct notifier_block *self, > - unsigned long val, void *data); > void __kretprobe_trampoline(void); > void __kprobes *trampoline_probe_handler(struct pt_regs *regs); > > diff --git a/arch/ia64/include/asm/kprobes.h b/arch/ia64/include/asm/kprobes.h > index 9e956768946cc..56004f97df6d2 100644 > --- a/arch/ia64/include/asm/kprobes.h > +++ b/arch/ia64/include/asm/kprobes.h > @@ -107,8 +107,6 @@ struct arch_specific_insn { > }; > > extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr); > -extern int kprobe_exceptions_notify(struct notifier_block *self, > - unsigned long val, void *data); > > extern void arch_remove_kprobe(struct kprobe *p); > > diff --git a/arch/mips/include/asm/kprobes.h b/arch/mips/include/asm/kprobes.h > index 68b1e5d458cfb..bc27d99c94363 100644 > --- a/arch/mips/include/asm/kprobes.h > +++ b/arch/mips/include/asm/kprobes.h > @@ -71,8 +71,6 @@ struct kprobe_ctlblk { > struct prev_kprobe prev_kprobe; > }; > > -extern int kprobe_exceptions_notify(struct notifier_block *self, > - unsigned long val, void *data); > > #endif /* CONFIG_KPROBES */ > #endif /* _ASM_KPROBES_H */ > diff --git a/arch/powerpc/include/asm/kprobes.h b/arch/powerpc/include/asm/kprobes.h > index c8e4b4fd4e330..4525a9c68260d 100644 > --- a/arch/powerpc/include/asm/kprobes.h > +++ b/arch/powerpc/include/asm/kprobes.h > @@ -84,8 +84,6 @@ struct arch_optimized_insn { > kprobe_opcode_t *insn; > }; > > -extern int kprobe_exceptions_notify(struct notifier_block *self, > - unsigned long val, void *data); > extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr); > extern int kprobe_handler(struct pt_regs *regs); > extern int kprobe_post_handler(struct pt_regs *regs); > diff --git a/arch/s390/include/asm/kprobes.h b/arch/s390/include/asm/kprobes.h > index 83f732ca3af4d..3f87125dd9b0d 100644 > --- a/arch/s390/include/asm/kprobes.h > +++ b/arch/s390/include/asm/kprobes.h > @@ -72,8 +72,6 @@ struct kprobe_ctlblk { > void arch_remove_kprobe(struct kprobe *p); > > int kprobe_fault_handler(struct pt_regs *regs, int trapnr); > -int kprobe_exceptions_notify(struct notifier_block *self, > - unsigned long val, void *data); > > #define flush_insn_slot(p) do { } while (0) > > diff --git a/arch/sh/include/asm/kprobes.h b/arch/sh/include/asm/kprobes.h > index eeba83e0a7d29..65d4c3316a5bd 100644 > --- a/arch/sh/include/asm/kprobes.h > +++ b/arch/sh/include/asm/kprobes.h > @@ -46,8 +46,6 @@ struct kprobe_ctlblk { > }; > > extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr); > -extern int kprobe_exceptions_notify(struct notifier_block *self, > - unsigned long val, void *data); > extern int kprobe_handle_illslot(unsigned long pc); > #else > > diff --git a/arch/sparc/include/asm/kprobes.h b/arch/sparc/include/asm/kprobes.h > index 06c2bc767ef75..aec742cd898f2 100644 > --- a/arch/sparc/include/asm/kprobes.h > +++ b/arch/sparc/include/asm/kprobes.h > @@ -47,8 +47,6 @@ struct kprobe_ctlblk { > struct prev_kprobe prev_kprobe; > }; > > -int kprobe_exceptions_notify(struct notifier_block *self, > - unsigned long val, void *data); > int kprobe_fault_handler(struct pt_regs *regs, int trapnr); > asmlinkage void __kprobes kprobe_trap(unsigned long trap_level, > struct pt_regs *regs); > diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h > index a2e9317aad495..5939694dfb28d 100644 > --- a/arch/x86/include/asm/kprobes.h > +++ b/arch/x86/include/asm/kprobes.h > @@ -113,8 +113,6 @@ struct kprobe_ctlblk { > }; > > extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr); > -extern int kprobe_exceptions_notify(struct notifier_block *self, > - unsigned long val, void *data); > extern int kprobe_int3_handler(struct pt_regs *regs); > > #else > diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h > index 85a64cb95d755..987911cdc90a2 100644 > --- a/include/linux/kprobes.h > +++ b/include/linux/kprobes.h > @@ -450,6 +450,10 @@ int kprobe_get_kallsym(unsigned int symnum, unsigned long *value, char *type, > > int arch_kprobe_get_kallsym(unsigned int *symnum, unsigned long *value, > char *type, char *sym); > + > +int kprobe_exceptions_notify(struct notifier_block *self, > + unsigned long val, void *data); > + > #else /* !CONFIG_KPROBES: */ > > static inline int kprobe_fault_handler(struct pt_regs *regs, int trapnr) > -- > 2.39.2 >
diff --git a/arch/arc/include/asm/kprobes.h b/arch/arc/include/asm/kprobes.h index de1566e32cb89..68e8301c0df2c 100644 --- a/arch/arc/include/asm/kprobes.h +++ b/arch/arc/include/asm/kprobes.h @@ -32,9 +32,6 @@ struct kprobe; void arch_remove_kprobe(struct kprobe *p); -int kprobe_exceptions_notify(struct notifier_block *self, - unsigned long val, void *data); - struct prev_kprobe { struct kprobe *kp; unsigned long status; diff --git a/arch/arm/include/asm/kprobes.h b/arch/arm/include/asm/kprobes.h index e26a278d301ab..5b8dbf1b0be49 100644 --- a/arch/arm/include/asm/kprobes.h +++ b/arch/arm/include/asm/kprobes.h @@ -40,8 +40,6 @@ struct kprobe_ctlblk { void arch_remove_kprobe(struct kprobe *); int kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr); -int kprobe_exceptions_notify(struct notifier_block *self, - unsigned long val, void *data); /* optinsn template addresses */ extern __visible kprobe_opcode_t optprobe_template_entry[]; diff --git a/arch/arm64/include/asm/kprobes.h b/arch/arm64/include/asm/kprobes.h index 05cd82eeca136..be7a3680dadff 100644 --- a/arch/arm64/include/asm/kprobes.h +++ b/arch/arm64/include/asm/kprobes.h @@ -37,8 +37,6 @@ struct kprobe_ctlblk { void arch_remove_kprobe(struct kprobe *); int kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr); -int kprobe_exceptions_notify(struct notifier_block *self, - unsigned long val, void *data); void __kretprobe_trampoline(void); void __kprobes *trampoline_probe_handler(struct pt_regs *regs); diff --git a/arch/ia64/include/asm/kprobes.h b/arch/ia64/include/asm/kprobes.h index 9e956768946cc..56004f97df6d2 100644 --- a/arch/ia64/include/asm/kprobes.h +++ b/arch/ia64/include/asm/kprobes.h @@ -107,8 +107,6 @@ struct arch_specific_insn { }; extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr); -extern int kprobe_exceptions_notify(struct notifier_block *self, - unsigned long val, void *data); extern void arch_remove_kprobe(struct kprobe *p); diff --git a/arch/mips/include/asm/kprobes.h b/arch/mips/include/asm/kprobes.h index 68b1e5d458cfb..bc27d99c94363 100644 --- a/arch/mips/include/asm/kprobes.h +++ b/arch/mips/include/asm/kprobes.h @@ -71,8 +71,6 @@ struct kprobe_ctlblk { struct prev_kprobe prev_kprobe; }; -extern int kprobe_exceptions_notify(struct notifier_block *self, - unsigned long val, void *data); #endif /* CONFIG_KPROBES */ #endif /* _ASM_KPROBES_H */ diff --git a/arch/powerpc/include/asm/kprobes.h b/arch/powerpc/include/asm/kprobes.h index c8e4b4fd4e330..4525a9c68260d 100644 --- a/arch/powerpc/include/asm/kprobes.h +++ b/arch/powerpc/include/asm/kprobes.h @@ -84,8 +84,6 @@ struct arch_optimized_insn { kprobe_opcode_t *insn; }; -extern int kprobe_exceptions_notify(struct notifier_block *self, - unsigned long val, void *data); extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr); extern int kprobe_handler(struct pt_regs *regs); extern int kprobe_post_handler(struct pt_regs *regs); diff --git a/arch/s390/include/asm/kprobes.h b/arch/s390/include/asm/kprobes.h index 83f732ca3af4d..3f87125dd9b0d 100644 --- a/arch/s390/include/asm/kprobes.h +++ b/arch/s390/include/asm/kprobes.h @@ -72,8 +72,6 @@ struct kprobe_ctlblk { void arch_remove_kprobe(struct kprobe *p); int kprobe_fault_handler(struct pt_regs *regs, int trapnr); -int kprobe_exceptions_notify(struct notifier_block *self, - unsigned long val, void *data); #define flush_insn_slot(p) do { } while (0) diff --git a/arch/sh/include/asm/kprobes.h b/arch/sh/include/asm/kprobes.h index eeba83e0a7d29..65d4c3316a5bd 100644 --- a/arch/sh/include/asm/kprobes.h +++ b/arch/sh/include/asm/kprobes.h @@ -46,8 +46,6 @@ struct kprobe_ctlblk { }; extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr); -extern int kprobe_exceptions_notify(struct notifier_block *self, - unsigned long val, void *data); extern int kprobe_handle_illslot(unsigned long pc); #else diff --git a/arch/sparc/include/asm/kprobes.h b/arch/sparc/include/asm/kprobes.h index 06c2bc767ef75..aec742cd898f2 100644 --- a/arch/sparc/include/asm/kprobes.h +++ b/arch/sparc/include/asm/kprobes.h @@ -47,8 +47,6 @@ struct kprobe_ctlblk { struct prev_kprobe prev_kprobe; }; -int kprobe_exceptions_notify(struct notifier_block *self, - unsigned long val, void *data); int kprobe_fault_handler(struct pt_regs *regs, int trapnr); asmlinkage void __kprobes kprobe_trap(unsigned long trap_level, struct pt_regs *regs); diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h index a2e9317aad495..5939694dfb28d 100644 --- a/arch/x86/include/asm/kprobes.h +++ b/arch/x86/include/asm/kprobes.h @@ -113,8 +113,6 @@ struct kprobe_ctlblk { }; extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr); -extern int kprobe_exceptions_notify(struct notifier_block *self, - unsigned long val, void *data); extern int kprobe_int3_handler(struct pt_regs *regs); #else diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h index 85a64cb95d755..987911cdc90a2 100644 --- a/include/linux/kprobes.h +++ b/include/linux/kprobes.h @@ -450,6 +450,10 @@ int kprobe_get_kallsym(unsigned int symnum, unsigned long *value, char *type, int arch_kprobe_get_kallsym(unsigned int *symnum, unsigned long *value, char *type, char *sym); + +int kprobe_exceptions_notify(struct notifier_block *self, + unsigned long val, void *data); + #else /* !CONFIG_KPROBES: */ static inline int kprobe_fault_handler(struct pt_regs *regs, int trapnr)