diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-11 12:24:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-11 12:24:55 +0300 |
| commit | f3edacbd697f94a743fff1a3d26910ab99948ba7 (patch) | |
| tree | c185057f2e3ae783ad3ccd5b5b96af200d2eb618 /arch/x86/include/asm | |
| parent | bee955cd3ab4f1a1eb8fc16e7ed69364143df8d7 (diff) | |
| download | linux-f3edacbd697f94a743fff1a3d26910ab99948ba7.tar.xz | |
bpf: Revert bpf_overrid_function() helper changes.
NACK'd by x86 maintainer.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/kprobes.h | 4 | ||||
| -rw-r--r-- | arch/x86/include/asm/ptrace.h | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h index c6c3b1f4306a..6cf65437b5e5 100644 --- a/arch/x86/include/asm/kprobes.h +++ b/arch/x86/include/asm/kprobes.h @@ -67,10 +67,6 @@ extern const int kretprobe_blacklist_size; void arch_remove_kprobe(struct kprobe *p); asmlinkage void kretprobe_trampoline(void); -#ifdef CONFIG_KPROBES_ON_FTRACE -extern void arch_ftrace_kprobe_override_function(struct pt_regs *regs); -#endif - /* Architecture specific copy of original instruction*/ struct arch_specific_insn { /* copy of the original instruction */ diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h index 2370bb0149cc..c0e3c45cf6ab 100644 --- a/arch/x86/include/asm/ptrace.h +++ b/arch/x86/include/asm/ptrace.h @@ -109,11 +109,6 @@ static inline unsigned long regs_return_value(struct pt_regs *regs) return regs->ax; } -static inline void regs_set_return_value(struct pt_regs *regs, unsigned long rc) -{ - regs->ax = rc; -} - /* * user_mode(regs) determines whether a register set came from user * mode. On x86_32, this is true if V8086 mode was enabled OR if the |