[FIX] opcode analysis: parameter type

diff --git a/uprobe/arch/asm-arm/swap_uprobes.c b/uprobe/arch/asm-arm/swap_uprobes.c
index 6c2ecdc..c48f158 100644 (file)
--- a/uprobe/arch/asm-arm/swap_uprobes.c
+++ b/uprobe/arch/asm-arm/swap_uprobes.c
@@ -674,10 +674,8 @@ int arch_prepare_uprobe(struct uprobe *up, struct hlist_head *page_list)
        return ret;
 }
 
-void arch_opcode_analysis_uretprobe(struct uretprobe *rp)
+void arch_opcode_analysis_uretprobe(kprobe_opcode_t opcode)
 {
-       kprobe_opcode_t opcode = rp->up.kp.opcode;
-
        /* Remove retprobe if first insn overwrites lr */
        rp->thumb_noret = !!(THUMB2_INSN_MATCH(BL, opcode) ||
                             THUMB2_INSN_MATCH(BLX1, opcode) ||

diff --git a/uprobe/arch/asm-arm/swap_uprobes.h b/uprobe/arch/asm-arm/swap_uprobes.h
index 1083791..07402a1 100644 (file)
--- a/uprobe/arch/asm-arm/swap_uprobes.h
+++ b/uprobe/arch/asm-arm/swap_uprobes.h
@@ -18,7 +18,7 @@ static inline int longjmp_break_uhandler(struct kprobe *p, struct pt_regs *regs)
        return 0;
 }
 
-void arch_opcode_analysis_uretprobe(struct uretprobe *rp);
+void arch_opcode_analysis_uretprobe(kprobe_opcode_t opcode);
 void arch_prepare_uretprobe(struct uretprobe_instance *ri, struct pt_regs *regs);
 
 unsigned long arch_get_trampoline_addr(struct kprobe *p, struct pt_regs *regs);

diff --git a/uprobe/swap_uprobes.c b/uprobe/swap_uprobes.c
index 4b3e551..a2f0a41 100644 (file)
--- a/uprobe/swap_uprobes.c
+++ b/uprobe/swap_uprobes.c
@@ -805,7 +805,7 @@ int dbi_register_uretprobe(struct uretprobe *rp)
        if (ret)
                return ret;
 
-       arch_opcode_analysis_uretprobe(rp);
+       arch_opcode_analysis_uretprobe(rp->up.kp.opcode);
 
        return 0;
 }