diff options
author | Marcin Nowakowski <marcin.nowakowski@imgtec.com> | 2016-10-07 20:03:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-07 21:46:30 -0400 |
commit | ea036230f7c604e3c90fbf57f4643bd733034af9 (patch) | |
tree | 861c0bd5d13df71e2b558208f9c153e6d2687b67 | |
parent | 470164572dc2f9e76e078e08498dfe32ae2faa6f (diff) |
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>
-rw-r--r-- | arch/mips/include/asm/uprobes.h | 12 | ||||
-rw-r--r-- | arch/s390/include/asm/uprobes.h | 10 |
2 files changed, 0 insertions, 22 deletions
diff --git a/arch/mips/include/asm/uprobes.h b/arch/mips/include/asm/uprobes.h index 70a4a2f173ff..b86d1ae07125 100644 --- a/arch/mips/include/asm/uprobes.h +++ b/arch/mips/include/asm/uprobes.h | |||
@@ -42,16 +42,4 @@ struct arch_uprobe_task { | |||
42 | unsigned long saved_trap_nr; | 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 | #endif /* __ASM_UPROBES_H */ | 45 | #endif /* __ASM_UPROBES_H */ |
diff --git a/arch/s390/include/asm/uprobes.h b/arch/s390/include/asm/uprobes.h index 1411dff7fea7..658393c65d7e 100644 --- a/arch/s390/include/asm/uprobes.h +++ b/arch/s390/include/asm/uprobes.h | |||
@@ -29,14 +29,4 @@ struct arch_uprobe { | |||
29 | struct arch_uprobe_task { | 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 | #endif /* _ASM_UPROBES_H */ | 32 | #endif /* _ASM_UPROBES_H */ |