summaryrefslogtreecommitdiff
path: root/arch/arm/kernel/probes.h
diff options
context:
space:
mode:
authorDavid A. Long <dave.long@linaro.org>2014-03-07 11:19:32 -0500
committerDavid A. Long <dave.long@linaro.org>2014-03-18 16:39:37 -0400
commit7579f4b3764337b39087d10496af0e741cbfe570 (patch)
tree009a68f8615a04fa038874522493006c2efb8022 /arch/arm/kernel/probes.h
parent3e6cd394bb10c2d65322e5f5d2ff0a9074d903a1 (diff)
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.h')
-rw-r--r--arch/arm/kernel/probes.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/kernel/probes.h b/arch/arm/kernel/probes.h
index 5554f161bdac..efea63c02742 100644
--- a/arch/arm/kernel/probes.h
+++ b/arch/arm/kernel/probes.h
@@ -22,6 +22,7 @@
#include <linux/types.h>
#include <linux/stddef.h>
#include <linux/kprobes.h>
+#include "kprobes.h"
#if __LINUX_ARM_ARCH__ >= 7
@@ -37,6 +38,7 @@ void __init find_str_pc_offset(void);
#endif
+struct decode_header;
/*
* Update ITSTATE after normal execution of an IT block instruction.
@@ -129,8 +131,10 @@ static inline void __kprobes alu_write_pc(long pcv, struct pt_regs *regs)
}
-void __kprobes kprobe_simulate_nop(struct kprobe *p, struct pt_regs *regs);
-void __kprobes kprobe_emulate_none(struct kprobe *p, struct pt_regs *regs);
+void __kprobes kprobe_simulate_nop(kprobe_opcode_t, struct arch_specific_insn *,
+ struct pt_regs *regs);
+void __kprobes kprobe_emulate_none(kprobe_opcode_t, struct arch_specific_insn *,
+ struct pt_regs *regs);
enum kprobe_insn __kprobes
kprobe_decode_ldmstm(kprobe_opcode_t insn, struct arch_specific_insn *asi,