Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

uprobes: remove function declarations from arch/{mips,s390}

The declarations of arch-specific functions have been moved to a common
header in commit 3820b4d2789f ('uprobes: Move function declarations out
of arch'), but MIPS and S390 has added them to their own trees later.
Remove the unnecessary duplicates.

Link: http://lkml.kernel.org/r/1472804384-17830-1-git-send-email-marcin.nowakowski@imgtec.com
Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Marcin Nowakowski and committed by
Linus Torvalds
ea036230 47016457

-22
-12
arch/mips/include/asm/uprobes.h
··· 42 42 unsigned long saved_trap_nr; 43 43 }; 44 44 45 - extern int arch_uprobe_analyze_insn(struct arch_uprobe *aup, 46 - struct mm_struct *mm, unsigned long addr); 47 - extern int arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs); 48 - extern int arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs); 49 - extern bool arch_uprobe_xol_was_trapped(struct task_struct *tsk); 50 - extern int arch_uprobe_exception_notify(struct notifier_block *self, 51 - unsigned long val, void *data); 52 - extern void arch_uprobe_abort_xol(struct arch_uprobe *aup, 53 - struct pt_regs *regs); 54 - extern unsigned long arch_uretprobe_hijack_return_addr( 55 - unsigned long trampoline_vaddr, struct pt_regs *regs); 56 - 57 45 #endif /* __ASM_UPROBES_H */
-10
arch/s390/include/asm/uprobes.h
··· 29 29 struct arch_uprobe_task { 30 30 }; 31 31 32 - int arch_uprobe_analyze_insn(struct arch_uprobe *aup, struct mm_struct *mm, 33 - unsigned long addr); 34 - int arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs); 35 - int arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs); 36 - bool arch_uprobe_xol_was_trapped(struct task_struct *tsk); 37 - int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val, 38 - void *data); 39 - void arch_uprobe_abort_xol(struct arch_uprobe *ap, struct pt_regs *regs); 40 - unsigned long arch_uretprobe_hijack_return_addr(unsigned long trampoline, 41 - struct pt_regs *regs); 42 32 #endif /* _ASM_UPROBES_H */