ARM: Make arch_specific_insn a define for new arch_probes_insn structure

Because the common underlying code for ARM kprobes and uprobes needs
to share a common architecrure-specific context structure, and because
the generic kprobes include file insists on defining this to a dummy
structure when kprobes is not configured, a new common structure is
required which can exist when uprobes is configured without kprobes.
In this case kprobes will define a dummy structure, but without the
define aliasing the two structure tags it will not affect uprobes and
the shared probes code.

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

12 files changed, 84 insertions, 82 deletions

diff --git a/arch/arm/include/asm/kprobes.h b/arch/arm/include/asm/kprobes.h
index 6e1046661f07..49fa0dfaad33 100644
--- a/arch/arm/include/asm/kprobes.h
+++ b/arch/arm/include/asm/kprobes.h
@@ -31,6 +31,8 @@ typedef u32 kprobe_opcode_t;
 struct kprobe;
 #include <asm/probes.h>
 
+#define arch_specific_insn      arch_probes_insn
+
 struct prev_kprobe {
         struct kprobe *kp;
         unsigned int status;
diff --git a/arch/arm/include/asm/probes.h b/arch/arm/include/asm/probes.h
index c37252c73ee5..806cfe622a9e 100644
--- a/arch/arm/include/asm/probes.h
+++ b/arch/arm/include/asm/probes.h
@@ -21,18 +21,18 @@
 
 typedef u32 probes_opcode_t;
 
-struct arch_specific_insn;
+struct arch_probes_insn;
 typedef void (probes_insn_handler_t)(probes_opcode_t,
-                                     struct arch_specific_insn *,
+                                     struct arch_probes_insn *,
                                      struct pt_regs *);
 typedef unsigned long (probes_check_cc)(unsigned long);
 typedef void (probes_insn_singlestep_t)(probes_opcode_t,
-                                        struct arch_specific_insn *,
+                                        struct arch_probes_insn *,
                                         struct pt_regs *);
 typedef void (probes_insn_fn_t)(void);
 
 /* Architecture specific copy of original instruction. */
-struct arch_specific_insn {
+struct arch_probes_insn {
         probes_opcode_t                 *insn;
         probes_insn_handler_t           *insn_handler;
         probes_check_cc                 *insn_check_cc;
diff --git a/arch/arm/kernel/kprobes-arm.c b/arch/arm/kernel/kprobes-arm.c
index d01d9f56f583..ac300c60d656 100644
--- a/arch/arm/kernel/kprobes-arm.c
+++ b/arch/arm/kernel/kprobes-arm.c
@@ -74,7 +74,7 @@
 
 static void __kprobes
 emulate_ldrdstrd(probes_opcode_t insn,
-        struct arch_specific_insn *asi, struct pt_regs *regs)
+        struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         unsigned long pc = regs->ARM_pc + 4;
         int rt = (insn >> 12) & 0xf;
@@ -103,7 +103,7 @@ emulate_ldrdstrd(probes_opcode_t insn,
 
 static void __kprobes
 emulate_ldr(probes_opcode_t insn,
-        struct arch_specific_insn *asi, struct pt_regs *regs)
+        struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         unsigned long pc = regs->ARM_pc + 4;
         int rt = (insn >> 12) & 0xf;
@@ -133,7 +133,7 @@ emulate_ldr(probes_opcode_t insn,
 
 static void __kprobes
 emulate_str(probes_opcode_t insn,
-        struct arch_specific_insn *asi, struct pt_regs *regs)
+        struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         unsigned long rtpc = regs->ARM_pc - 4 + str_pc_offset;
         unsigned long rnpc = regs->ARM_pc + 4;
@@ -160,7 +160,7 @@ emulate_str(probes_opcode_t insn,
 
 static void __kprobes
 emulate_rd12rn16rm0rs8_rwflags(probes_opcode_t insn,
-        struct arch_specific_insn *asi, struct pt_regs *regs)
+        struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         unsigned long pc = regs->ARM_pc + 4;
         int rd = (insn >> 12) & 0xf;
@@ -195,7 +195,7 @@ emulate_rd12rn16rm0rs8_rwflags(probes_opcode_t insn,
 
 static void __kprobes
 emulate_rd12rn16rm0_rwflags_nopc(probes_opcode_t insn,
-        struct arch_specific_insn *asi, struct pt_regs *regs)
+        struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         int rd = (insn >> 12) & 0xf;
         int rn = (insn >> 16) & 0xf;
@@ -222,7 +222,7 @@ emulate_rd12rn16rm0_rwflags_nopc(probes_opcode_t insn,
 
 static void __kprobes
 emulate_rd16rn12rm0rs8_rwflags_nopc(probes_opcode_t insn,
-        struct arch_specific_insn *asi,
+        struct arch_probes_insn *asi,
         struct pt_regs *regs)
 {
         int rd = (insn >> 16) & 0xf;
@@ -252,7 +252,7 @@ emulate_rd16rn12rm0rs8_rwflags_nopc(probes_opcode_t insn,
 
 static void __kprobes
 emulate_rd12rm0_noflags_nopc(probes_opcode_t insn,
-        struct arch_specific_insn *asi, struct pt_regs *regs)
+        struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         int rd = (insn >> 12) & 0xf;
         int rm = insn & 0xf;
@@ -272,7 +272,7 @@ emulate_rd12rm0_noflags_nopc(probes_opcode_t insn,
 
 static void __kprobes
 emulate_rdlo12rdhi16rn0rm8_rwflags_nopc(probes_opcode_t insn,
-        struct arch_specific_insn *asi,
+        struct arch_probes_insn *asi,
         struct pt_regs *regs)
 {
         int rdlo = (insn >> 12) & 0xf;
diff --git a/arch/arm/kernel/kprobes-common.c b/arch/arm/kernel/kprobes-common.c
index 6159725597a1..c311ed94ff1c 100644
--- a/arch/arm/kernel/kprobes-common.c
+++ b/arch/arm/kernel/kprobes-common.c
@@ -18,7 +18,7 @@
 
 
 static void __kprobes simulate_ldm1stm1(probes_opcode_t insn,
-                struct arch_specific_insn *asi,
+                struct arch_probes_insn *asi,
                 struct pt_regs *regs)
 {
         int rn = (insn >> 16) & 0xf;
@@ -60,7 +60,7 @@ static void __kprobes simulate_ldm1stm1(probes_opcode_t insn,
 }
 
 static void __kprobes simulate_stm1_pc(probes_opcode_t insn,
-        struct arch_specific_insn *asi,
+        struct arch_probes_insn *asi,
         struct pt_regs *regs)
 {
         unsigned long addr = regs->ARM_pc - 4;
@@ -71,7 +71,7 @@ static void __kprobes simulate_stm1_pc(probes_opcode_t insn,
 }
 
 static void __kprobes simulate_ldm1_pc(probes_opcode_t insn,
-        struct arch_specific_insn *asi,
+        struct arch_probes_insn *asi,
         struct pt_regs *regs)
 {
         simulate_ldm1stm1(insn, asi, regs);
@@ -80,7 +80,7 @@ static void __kprobes simulate_ldm1_pc(probes_opcode_t insn,
 
 static void __kprobes
 emulate_generic_r0_12_noflags(probes_opcode_t insn,
-        struct arch_specific_insn *asi, struct pt_regs *regs)
+        struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         register void *rregs asm("r1") = regs;
         register void *rfn asm("lr") = asi->insn_fn;
@@ -108,7 +108,7 @@ emulate_generic_r0_12_noflags(probes_opcode_t insn,
 
 static void __kprobes
 emulate_generic_r2_14_noflags(probes_opcode_t insn,
-        struct arch_specific_insn *asi, struct pt_regs *regs)
+        struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         emulate_generic_r0_12_noflags(insn, asi,
                 (struct pt_regs *)(regs->uregs+2));
@@ -116,7 +116,7 @@ emulate_generic_r2_14_noflags(probes_opcode_t insn,
 
 static void __kprobes
 emulate_ldm_r3_15(probes_opcode_t insn,
-        struct arch_specific_insn *asi, struct pt_regs *regs)
+        struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         emulate_generic_r0_12_noflags(insn, asi,
                 (struct pt_regs *)(regs->uregs+3));
@@ -124,7 +124,7 @@ emulate_ldm_r3_15(probes_opcode_t insn,
 }
 
 enum probes_insn __kprobes
-kprobe_decode_ldmstm(probes_opcode_t insn, struct arch_specific_insn *asi,
+kprobe_decode_ldmstm(probes_opcode_t insn, struct arch_probes_insn *asi,
                 const struct decode_header *h)
 {
         probes_insn_handler_t *handler = 0;
diff --git a/arch/arm/kernel/kprobes-thumb.c b/arch/arm/kernel/kprobes-thumb.c
index c271d5d2810c..6619188619ae 100644
--- a/arch/arm/kernel/kprobes-thumb.c
+++ b/arch/arm/kernel/kprobes-thumb.c
@@ -24,7 +24,7 @@
 
 static void __kprobes
 t32_simulate_table_branch(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         unsigned long pc = regs->ARM_pc;
         int rn = (insn >> 16) & 0xf;
@@ -44,7 +44,7 @@ t32_simulate_table_branch(probes_opcode_t insn,
 
 static void __kprobes
 t32_simulate_mrs(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         int rd = (insn >> 8) & 0xf;
         unsigned long mask = 0xf8ff03df; /* Mask out execution state */
@@ -53,7 +53,7 @@ t32_simulate_mrs(probes_opcode_t insn,
 
 static void __kprobes
 t32_simulate_cond_branch(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         unsigned long pc = regs->ARM_pc;
 
@@ -67,7 +67,7 @@ t32_simulate_cond_branch(probes_opcode_t insn,
 }
 
 static enum probes_insn __kprobes
-t32_decode_cond_branch(probes_opcode_t insn, struct arch_specific_insn *asi,
+t32_decode_cond_branch(probes_opcode_t insn, struct arch_probes_insn *asi,
                 const struct decode_header *d)
 {
         int cc = (insn >> 22) & 0xf;
@@ -78,7 +78,7 @@ t32_decode_cond_branch(probes_opcode_t insn, struct arch_specific_insn *asi,
 
 static void __kprobes
 t32_simulate_branch(probes_opcode_t insn,
-                    struct arch_specific_insn *asi, struct pt_regs *regs)
+                    struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         unsigned long pc = regs->ARM_pc;
 
@@ -106,7 +106,7 @@ t32_simulate_branch(probes_opcode_t insn,
 
 static void __kprobes
 t32_simulate_ldr_literal(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         unsigned long addr = regs->ARM_pc & ~3;
         int rt = (insn >> 12) & 0xf;
@@ -143,7 +143,7 @@ t32_simulate_ldr_literal(probes_opcode_t insn,
 }
 
 static enum probes_insn __kprobes
-t32_decode_ldmstm(probes_opcode_t insn, struct arch_specific_insn *asi,
+t32_decode_ldmstm(probes_opcode_t insn, struct arch_probes_insn *asi,
                 const struct decode_header *d)
 {
         enum probes_insn ret = kprobe_decode_ldmstm(insn, asi, d);
@@ -158,7 +158,7 @@ t32_decode_ldmstm(probes_opcode_t insn, struct arch_specific_insn *asi,
 
 static void __kprobes
 t32_emulate_ldrdstrd(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         unsigned long pc = regs->ARM_pc & ~3;
         int rt1 = (insn >> 12) & 0xf;
@@ -185,7 +185,7 @@ t32_emulate_ldrdstrd(probes_opcode_t insn,
 
 static void __kprobes
 t32_emulate_ldrstr(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         int rt = (insn >> 12) & 0xf;
         int rn = (insn >> 16) & 0xf;
@@ -211,7 +211,7 @@ t32_emulate_ldrstr(probes_opcode_t insn,
 
 static void __kprobes
 t32_emulate_rd8rn16rm0_rwflags(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         int rd = (insn >> 8) & 0xf;
         int rn = (insn >> 16) & 0xf;
@@ -238,7 +238,7 @@ t32_emulate_rd8rn16rm0_rwflags(probes_opcode_t insn,
 
 static void __kprobes
 t32_emulate_rd8pc16_noflags(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         unsigned long pc = regs->ARM_pc;
         int rd = (insn >> 8) & 0xf;
@@ -258,7 +258,7 @@ t32_emulate_rd8pc16_noflags(probes_opcode_t insn,
 
 static void __kprobes
 t32_emulate_rd8rn16_noflags(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         int rd = (insn >> 8) & 0xf;
         int rn = (insn >> 16) & 0xf;
@@ -278,7 +278,7 @@ t32_emulate_rd8rn16_noflags(probes_opcode_t insn,
 
 static void __kprobes
 t32_emulate_rdlo12rdhi8rn16rm0_noflags(probes_opcode_t insn,
-                struct arch_specific_insn *asi,
+                struct arch_probes_insn *asi,
                 struct pt_regs *regs)
 {
         int rdlo = (insn >> 12) & 0xf;
@@ -306,7 +306,7 @@ t32_emulate_rdlo12rdhi8rn16rm0_noflags(probes_opcode_t insn,
 
 static void __kprobes
 t16_simulate_bxblx(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         unsigned long pc = regs->ARM_pc + 2;
         int rm = (insn >> 3) & 0xf;
@@ -320,7 +320,7 @@ t16_simulate_bxblx(probes_opcode_t insn,
 
 static void __kprobes
 t16_simulate_ldr_literal(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         unsigned long *base = (unsigned long *)((regs->ARM_pc + 2) & ~3);
         long index = insn & 0xff;
@@ -330,7 +330,7 @@ t16_simulate_ldr_literal(probes_opcode_t insn,
 
 static void __kprobes
 t16_simulate_ldrstr_sp_relative(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         unsigned long* base = (unsigned long *)regs->ARM_sp;
         long index = insn & 0xff;
@@ -343,7 +343,7 @@ t16_simulate_ldrstr_sp_relative(probes_opcode_t insn,
 
 static void __kprobes
 t16_simulate_reladr(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         unsigned long base = (insn & 0x800) ? regs->ARM_sp
                                             : ((regs->ARM_pc + 2) & ~3);
@@ -354,7 +354,7 @@ t16_simulate_reladr(probes_opcode_t insn,
 
 static void __kprobes
 t16_simulate_add_sp_imm(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         long imm = insn & 0x7f;
         if (insn & 0x80) /* SUB */
@@ -365,7 +365,7 @@ t16_simulate_add_sp_imm(probes_opcode_t insn,
 
 static void __kprobes
 t16_simulate_cbz(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         int rn = insn & 0x7;
         probes_opcode_t nonzero = regs->uregs[rn] ? insn : ~insn;
@@ -379,7 +379,7 @@ t16_simulate_cbz(probes_opcode_t insn,
 
 static void __kprobes
 t16_simulate_it(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         /*
          * The 8 IT state bits are split into two parts in CPSR:
@@ -396,14 +396,14 @@ t16_simulate_it(probes_opcode_t insn,
 
 static void __kprobes
 t16_singlestep_it(probes_opcode_t insn,
-                  struct arch_specific_insn *asi, struct pt_regs *regs)
+                  struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         regs->ARM_pc += 2;
         t16_simulate_it(insn, asi, regs);
 }
 
 static enum probes_insn __kprobes
-t16_decode_it(probes_opcode_t insn, struct arch_specific_insn *asi,
+t16_decode_it(probes_opcode_t insn, struct arch_probes_insn *asi,
                 const struct decode_header *d)
 {
         asi->insn_singlestep = t16_singlestep_it;
@@ -412,7 +412,7 @@ t16_decode_it(probes_opcode_t insn, struct arch_specific_insn *asi,
 
 static void __kprobes
 t16_simulate_cond_branch(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         unsigned long pc = regs->ARM_pc + 2;
         long offset = insn & 0x7f;
@@ -421,7 +421,7 @@ t16_simulate_cond_branch(probes_opcode_t insn,
 }
 
 static enum probes_insn __kprobes
-t16_decode_cond_branch(probes_opcode_t insn, struct arch_specific_insn *asi,
+t16_decode_cond_branch(probes_opcode_t insn, struct arch_probes_insn *asi,
                 const struct decode_header *d)
 {
         int cc = (insn >> 8) & 0xf;
@@ -432,7 +432,7 @@ t16_decode_cond_branch(probes_opcode_t insn, struct arch_specific_insn *asi,
 
 static void __kprobes
 t16_simulate_branch(probes_opcode_t insn,
-                   struct arch_specific_insn *asi, struct pt_regs *regs)
+                   struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         unsigned long pc = regs->ARM_pc + 2;
         long offset = insn & 0x3ff;
@@ -442,7 +442,7 @@ t16_simulate_branch(probes_opcode_t insn,
 
 static unsigned long __kprobes
 t16_emulate_loregs(probes_opcode_t insn,
-                   struct arch_specific_insn *asi, struct pt_regs *regs)
+                   struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         unsigned long oldcpsr = regs->ARM_cpsr;
         unsigned long newcpsr;
@@ -465,14 +465,14 @@ t16_emulate_loregs(probes_opcode_t insn,
 
 static void __kprobes
 t16_emulate_loregs_rwflags(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         regs->ARM_cpsr = t16_emulate_loregs(insn, asi, regs);
 }
 
 static void __kprobes
 t16_emulate_loregs_noitrwflags(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         unsigned long cpsr = t16_emulate_loregs(insn, asi, regs);
         if (!in_it_block(cpsr))
@@ -481,7 +481,7 @@ t16_emulate_loregs_noitrwflags(probes_opcode_t insn,
 
 static void __kprobes
 t16_emulate_hiregs(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         unsigned long pc = regs->ARM_pc + 2;
         int rdn = (insn & 0x7) | ((insn & 0x80) >> 4);
@@ -511,7 +511,7 @@ t16_emulate_hiregs(probes_opcode_t insn,
 }
 
 static enum probes_insn __kprobes
-t16_decode_hiregs(probes_opcode_t insn, struct arch_specific_insn *asi,
+t16_decode_hiregs(probes_opcode_t insn, struct arch_probes_insn *asi,
                 const struct decode_header *d)
 {
         insn &= ~0x00ff;
@@ -523,7 +523,7 @@ t16_decode_hiregs(probes_opcode_t insn, struct arch_specific_insn *asi,
 
 static void __kprobes
 t16_emulate_push(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         __asm__ __volatile__ (
                 "ldr    r9, [%[regs], #13*4]    \n\t"
@@ -539,7 +539,7 @@ t16_emulate_push(probes_opcode_t insn,
 }
 
 static enum probes_insn __kprobes
-t16_decode_push(probes_opcode_t insn, struct arch_specific_insn *asi,
+t16_decode_push(probes_opcode_t insn, struct arch_probes_insn *asi,
                 const struct decode_header *d)
 {
         /*
@@ -555,7 +555,7 @@ t16_decode_push(probes_opcode_t insn, struct arch_specific_insn *asi,
 
 static void __kprobes
 t16_emulate_pop_nopc(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         __asm__ __volatile__ (
                 "ldr    r9, [%[regs], #13*4]    \n\t"
@@ -572,7 +572,7 @@ t16_emulate_pop_nopc(probes_opcode_t insn,
 
 static void __kprobes
 t16_emulate_pop_pc(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         register unsigned long pc asm("r8");
 
@@ -592,7 +592,7 @@ t16_emulate_pop_pc(probes_opcode_t insn,
 }
 
 static enum probes_insn __kprobes
-t16_decode_pop(probes_opcode_t insn, struct arch_specific_insn *asi,
+t16_decode_pop(probes_opcode_t insn, struct arch_probes_insn *asi,
                 const struct decode_header *d)
 {
         /*
diff --git a/arch/arm/kernel/kprobes.h b/arch/arm/kernel/kprobes.h
index d0a24b73bcfa..9a2712ecefc3 100644
--- a/arch/arm/kernel/kprobes.h
+++ b/arch/arm/kernel/kprobes.h
@@ -30,11 +30,11 @@
 #define KPROBE_THUMB32_BREAKPOINT_INSTRUCTION   0xf7f0a018
 
 enum probes_insn __kprobes
-kprobe_decode_ldmstm(kprobe_opcode_t insn, struct arch_specific_insn *asi,
+kprobe_decode_ldmstm(kprobe_opcode_t insn, struct arch_probes_insn *asi,
                 const struct decode_header *h);
 
 typedef enum probes_insn (kprobe_decode_insn_t)(probes_opcode_t,
-                                                struct arch_specific_insn *,
+                                                struct arch_probes_insn *,
                                                 bool,
                                                 const union decode_action *);
 
diff --git a/arch/arm/kernel/probes-arm.c b/arch/arm/kernel/probes-arm.c
index 8e7fde876521..51a13a027989 100644
--- a/arch/arm/kernel/probes-arm.c
+++ b/arch/arm/kernel/probes-arm.c
@@ -58,7 +58,7 @@
  */
 
 void __kprobes simulate_bbl(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         long iaddr = (long) regs->ARM_pc - 4;
         int disp  = branch_displacement(insn);
@@ -70,7 +70,7 @@ void __kprobes simulate_bbl(probes_opcode_t insn,
 }
 
 void __kprobes simulate_blx1(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         long iaddr = (long) regs->ARM_pc - 4;
         int disp = branch_displacement(insn);
@@ -81,7 +81,7 @@ void __kprobes simulate_blx1(probes_opcode_t insn,
 }
 
 void __kprobes simulate_blx2bx(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         int rm = insn & 0xf;
         long rmv = regs->uregs[rm];
@@ -96,7 +96,7 @@ void __kprobes simulate_blx2bx(probes_opcode_t insn,
 }
 
 void __kprobes simulate_mrs(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         int rd = (insn >> 12) & 0xf;
         unsigned long mask = 0xf8ff03df; /* Mask out execution state */
@@ -104,7 +104,7 @@ void __kprobes simulate_mrs(probes_opcode_t insn,
 }
 
 void __kprobes simulate_mov_ipsp(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         regs->uregs[12] = regs->uregs[13];
 }
@@ -705,7 +705,7 @@ EXPORT_SYMBOL_GPL(probes_decode_arm_table);
 #endif
 
 static void __kprobes arm_singlestep(probes_opcode_t insn,
-                struct arch_specific_insn *asi, struct pt_regs *regs)
+                struct arch_probes_insn *asi, struct pt_regs *regs)
 {
         regs->ARM_pc += 4;
         asi->insn_handler(insn, asi, regs);
@@ -724,7 +724,7 @@ static void __kprobes arm_singlestep(probes_opcode_t insn,
  *   should also be very rare.
  */
 enum probes_insn __kprobes
-arm_probes_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi,
+arm_probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
                        bool emulate, const union decode_action *actions)
 {
         asi->insn_singlestep = arm_singlestep;
diff --git a/arch/arm/kernel/probes-arm.h b/arch/arm/kernel/probes-arm.h
index ea614dc5aaa3..ace6572f6e26 100644
--- a/arch/arm/kernel/probes-arm.h
+++ b/arch/arm/kernel/probes-arm.h
@@ -54,20 +54,20 @@ enum probes_arm_action {
 };
 
 void __kprobes simulate_bbl(probes_opcode_t opcode,
-        struct arch_specific_insn *asi, struct pt_regs *regs);
+        struct arch_probes_insn *asi, struct pt_regs *regs);
 void __kprobes simulate_blx1(probes_opcode_t opcode,
-        struct arch_specific_insn *asi, struct pt_regs *regs);
+        struct arch_probes_insn *asi, struct pt_regs *regs);
 void __kprobes simulate_blx2bx(probes_opcode_t opcode,
-        struct arch_specific_insn *asi, struct pt_regs *regs);
+        struct arch_probes_insn *asi, struct pt_regs *regs);
 void __kprobes simulate_mrs(probes_opcode_t opcode,
-        struct arch_specific_insn *asi, struct pt_regs *regs);
+        struct arch_probes_insn *asi, struct pt_regs *regs);
 void __kprobes simulate_mov_ipsp(probes_opcode_t opcode,
-        struct arch_specific_insn *asi, struct pt_regs *regs);
+        struct arch_probes_insn *asi, struct pt_regs *regs);
 
 extern const union decode_item probes_decode_arm_table[];
 
 enum probes_insn arm_probes_decode_insn(probes_opcode_t,
-                struct arch_specific_insn *, bool emulate,
+                struct arch_probes_insn *, bool emulate,
                 const union decode_action *actions);
 
 #endif
diff --git a/arch/arm/kernel/probes-thumb.c b/arch/arm/kernel/probes-thumb.c
index 23e2cbdb37cb..4131351e812f 100644
--- a/arch/arm/kernel/probes-thumb.c
+++ b/arch/arm/kernel/probes-thumb.c
@@ -844,7 +844,7 @@ static unsigned long __kprobes thumb_check_cc(unsigned long cpsr)
 }
 
 static void __kprobes thumb16_singlestep(probes_opcode_t opcode,
-                struct arch_specific_insn *asi,
+                struct arch_probes_insn *asi,
                 struct pt_regs *regs)
 {
         regs->ARM_pc += 2;
@@ -853,7 +853,7 @@ static void __kprobes thumb16_singlestep(probes_opcode_t opcode,
 }
 
 static void __kprobes thumb32_singlestep(probes_opcode_t opcode,
-                struct arch_specific_insn *asi,
+                struct arch_probes_insn *asi,
                 struct pt_regs *regs)
 {
         regs->ARM_pc += 4;
@@ -862,7 +862,7 @@ static void __kprobes thumb32_singlestep(probes_opcode_t opcode,
 }
 
 enum probes_insn __kprobes
-thumb16_probes_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi,
+thumb16_probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
                            bool emulate, const union decode_action *actions)
 {
         asi->insn_singlestep = thumb16_singlestep;
@@ -872,7 +872,7 @@ thumb16_probes_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi,
 }
 
 enum probes_insn __kprobes
-thumb32_probes_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi,
+thumb32_probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
                            bool emulate, const union decode_action *actions)
 {
         asi->insn_singlestep = thumb32_singlestep;
diff --git a/arch/arm/kernel/probes-thumb.h b/arch/arm/kernel/probes-thumb.h
index 65e4250e9b78..7c6f6ebe514f 100644
--- a/arch/arm/kernel/probes-thumb.h
+++ b/arch/arm/kernel/probes-thumb.h
@@ -88,10 +88,10 @@ extern const union decode_item probes_decode_thumb32_table[];
 extern const union decode_item probes_decode_thumb16_table[];
 
 enum probes_insn __kprobes
-thumb16_probes_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi,
+thumb16_probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
                 bool emulate, const union decode_action *actions);
 enum probes_insn __kprobes
-thumb32_probes_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi,
+thumb32_probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
                 bool emulate, const union decode_action *actions);
 
 #endif
diff --git a/arch/arm/kernel/probes.c b/arch/arm/kernel/probes.c
index f9dff12cf85c..b41873f33e69 100644
--- a/arch/arm/kernel/probes.c
+++ b/arch/arm/kernel/probes.c
@@ -176,13 +176,13 @@ probes_check_cc * const probes_condition_checks[16] = {
 
 
 void __kprobes probes_simulate_nop(probes_opcode_t opcode,
-        struct arch_specific_insn *asi,
+        struct arch_probes_insn *asi,
         struct pt_regs *regs)
 {
 }
 
 void __kprobes probes_emulate_none(probes_opcode_t opcode,
-        struct arch_specific_insn *asi,
+        struct arch_probes_insn *asi,
         struct pt_regs *regs)
 {
         asi->insn_fn();
@@ -196,7 +196,7 @@ void __kprobes probes_emulate_none(probes_opcode_t opcode,
  * emulation handler is called.
  */
 static probes_opcode_t __kprobes
-prepare_emulated_insn(probes_opcode_t insn, struct arch_specific_insn *asi,
+prepare_emulated_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
                       bool thumb)
 {
 #ifdef CONFIG_THUMB2_KERNEL
@@ -221,7 +221,7 @@ prepare_emulated_insn(probes_opcode_t insn, struct arch_specific_insn *asi,
  * prepare_emulated_insn
  */
 static void  __kprobes
-set_emulated_insn(probes_opcode_t insn, struct arch_specific_insn *asi,
+set_emulated_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
                   bool thumb)
 {
 #ifdef CONFIG_THUMB2_KERNEL
@@ -385,7 +385,7 @@ static const int decode_struct_sizes[NUM_DECODE_TYPES] = {
  *
  */
 int __kprobes
-probes_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi,
+probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
                    const union decode_item *table, bool thumb,
                    bool emulate, const union decode_action *actions)
 {
diff --git a/arch/arm/kernel/probes.h b/arch/arm/kernel/probes.h
index 33cc30c50cf5..dba9f2466a93 100644
--- a/arch/arm/kernel/probes.h
+++ b/arch/arm/kernel/probes.h
@@ -306,7 +306,7 @@ union decode_item {
 
 struct decode_header;
 typedef enum probes_insn (probes_custom_decode_t)(probes_opcode_t,
-                                                  struct arch_specific_insn *,
+                                                  struct arch_probes_insn *,
                                                   const struct decode_header *);
 
 union decode_action {
@@ -400,7 +400,7 @@ probes_insn_handler_t probes_simulate_nop;
 probes_insn_handler_t probes_emulate_none;
 
 int __kprobes
-probes_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi,
+probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
                 const union decode_item *table, bool thumb, bool emulate,
                 const union decode_action *actions);