ARM: Make the kprobes condition_check symbol names more generic

In preparation for sharing the ARM kprobes instruction interpreting
code with uprobes, make the symbols names less kprobes-specific.

Signed-off-by: David A. Long <dave.long@linaro.org>
Acked-by: Jon Medhurst <tixy@linaro.org>

1 files changed, 6 insertions, 5 deletions

diff --git a/arch/arm/include/asm/probes.h b/arch/arm/include/asm/probes.h
index 4d014c4aa1e7..c4acf6c8a2d4 100644
--- a/arch/arm/include/asm/probes.h
+++ b/arch/arm/include/asm/probes.h
@@ -20,22 +20,23 @@
 #define _ASM_PROBES_H
 
 struct kprobe;
+typedef u32 probes_opcode_t;
 
 struct arch_specific_insn;
-typedef void (kprobe_insn_handler_t)(kprobe_opcode_t,
+typedef void (kprobe_insn_handler_t)(probes_opcode_t,
                                      struct arch_specific_insn *,
                                      struct pt_regs *);
-typedef unsigned long (kprobe_check_cc)(unsigned long);
-typedef void (kprobe_insn_singlestep_t)(kprobe_opcode_t,
+typedef unsigned long (probes_check_cc)(unsigned long);
+typedef void (kprobe_insn_singlestep_t)(probes_opcode_t,
                                         struct arch_specific_insn *,
                                         struct pt_regs *);
 typedef void (kprobe_insn_fn_t)(void);
 
 /* Architecture specific copy of original instruction. */
 struct arch_specific_insn {
-        kprobe_opcode_t                 *insn;
+        probes_opcode_t                 *insn;
         kprobe_insn_handler_t           *insn_handler;
-        kprobe_check_cc                 *insn_check_cc;
+        probes_check_cc                 *insn_check_cc;
         kprobe_insn_singlestep_t        *insn_singlestep;
         kprobe_insn_fn_t                *insn_fn;
 };