diff options
| author | David A. Long <dave.long@linaro.org> | 2014-03-07 11:19:32 -0500 |
|---|---|---|
| committer | David A. Long <dave.long@linaro.org> | 2014-03-18 16:39:37 -0400 |
| commit | 7579f4b3764337b39087d10496af0e741cbfe570 (patch) | |
| tree | 009a68f8615a04fa038874522493006c2efb8022 /arch/arm/kernel/probes.c | |
| parent | 3e6cd394bb10c2d65322e5f5d2ff0a9074d903a1 (diff) | |
| download | blackbird-op-linux-7579f4b3764337b39087d10496af0e741cbfe570.tar.gz blackbird-op-linux-7579f4b3764337b39087d10496af0e741cbfe570.zip | |
ARM: Remove use of struct kprobe from generic probes code
Change the generic ARM probes code to pass in the opcode and architecture-specific
structure separately instead of using struct kprobe, so we do not pollute
code being used only for uprobes or other non-kprobes instruction
interpretation.
Signed-off-by: David A. Long <dave.long@linaro.org>
Acked-by: Jon Medhurst <tixy@linaro.org>
Diffstat (limited to 'arch/arm/kernel/probes.c')
| -rw-r--r-- | arch/arm/kernel/probes.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/arch/arm/kernel/probes.c b/arch/arm/kernel/probes.c index efd92c5b4a52..f2ab8856ba2b 100644 --- a/arch/arm/kernel/probes.c +++ b/arch/arm/kernel/probes.c @@ -13,12 +13,11 @@ #include <linux/kernel.h> #include <linux/types.h> -#include <linux/kprobes.h> #include <asm/system_info.h> #include <asm/ptrace.h> #include <linux/bug.h> -#include "kprobes.h" +#include "probes.h" #ifndef find_str_pc_offset @@ -176,13 +175,17 @@ kprobe_check_cc * const kprobe_condition_checks[16] = { }; -void __kprobes kprobe_simulate_nop(struct kprobe *p, struct pt_regs *regs) +void __kprobes kprobe_simulate_nop(kprobe_opcode_t opcode, + struct arch_specific_insn *asi, + struct pt_regs *regs) { } -void __kprobes kprobe_emulate_none(struct kprobe *p, struct pt_regs *regs) +void __kprobes kprobe_emulate_none(kprobe_opcode_t opcode, + struct arch_specific_insn *asi, + struct pt_regs *regs) { - p->ainsn.insn_fn(); + asi->insn_fn(); } /* |
