ARM: Change more ARM kprobes symbol names to something more generic

Change kprobe_emulate_none, kprobe_simulate_nop, and arm_kprobe_decode_init
function names to something more appropriate for code being shared
outside of the kprobes subsystem. Also, move the new arm_probes_decode_init
declaration out of the kprobes.h include file and into the probes.h include file.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/arch/arm/kernel/kprobes-thumb.c b/arch/arm/kernel/kprobes-thumb.c
index 610d6932e9bf..2a73330fb19f 100644
--- a/arch/arm/kernel/kprobes-thumb.c
+++ b/arch/arm/kernel/kprobes-thumb.c
@@ -613,8 +613,8 @@ const union decode_action kprobes_t16_actions[NUM_PROBES_T16_ACTIONS] = {
         [PROBES_T16_SIGN_EXTEND] = {.handler = t16_emulate_loregs_rwflags},
         [PROBES_T16_PUSH] = {.decoder = t16_decode_push},
         [PROBES_T16_POP] = {.decoder = t16_decode_pop},
-        [PROBES_T16_SEV] = {.handler = kprobe_emulate_none},
-        [PROBES_T16_WFE] = {.handler = kprobe_simulate_nop},
+        [PROBES_T16_SEV] = {.handler = probes_emulate_none},
+        [PROBES_T16_WFE] = {.handler = probes_simulate_nop},
         [PROBES_T16_IT] = {.decoder = t16_decode_it},
         [PROBES_T16_CMP] = {.handler = t16_emulate_loregs_rwflags},
         [PROBES_T16_ADDSUB] = {.handler = t16_emulate_loregs_noitrwflags},
@@ -644,12 +644,12 @@ const union decode_action kprobes_t32_actions[NUM_PROBES_T32_ACTIONS] = {
         [PROBES_T32_MOVW] = {.handler = t32_emulate_rd8rn16_noflags},
         [PROBES_T32_SAT] = {.handler = t32_emulate_rd8rn16rm0_rwflags},
         [PROBES_T32_BITFIELD] = {.handler = t32_emulate_rd8rn16_noflags},
-        [PROBES_T32_SEV] = {.handler = kprobe_emulate_none},
-        [PROBES_T32_WFE] = {.handler = kprobe_simulate_nop},
+        [PROBES_T32_SEV] = {.handler = probes_emulate_none},
+        [PROBES_T32_WFE] = {.handler = probes_simulate_nop},
         [PROBES_T32_MRS] = {.handler = t32_simulate_mrs},
         [PROBES_T32_BRANCH_COND] = {.decoder = t32_decode_cond_branch},
         [PROBES_T32_BRANCH] = {.handler = t32_simulate_branch},
-        [PROBES_T32_PLDI] = {.handler = kprobe_simulate_nop},
+        [PROBES_T32_PLDI] = {.handler = probes_simulate_nop},
         [PROBES_T32_LDR_LIT] = {.handler = t32_simulate_ldr_literal},
         [PROBES_T32_LDRSTR] = {.handler = t32_emulate_ldrstr},
         [PROBES_T32_SIGN_EXTEND] = {.handler = t32_emulate_rd8rn16rm0_rwflags},