Merge tag 'hwlock-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson...

[linux-2.6-microblaze.git] / arch / csky / kernel / probes / simulate-insn.c

diff --git a/arch/csky/kernel/probes/simulate-insn.c b/arch/csky/kernel/probes/simulate-insn.c
index 4e464fe..d6e8d09 100644 (file)
--- a/arch/csky/kernel/probes/simulate-insn.c
+++ b/arch/csky/kernel/probes/simulate-insn.c
@@ -274,9 +274,9 @@ void __kprobes
 simulate_bnezad32(u32 opcode, long addr, struct pt_regs *regs)
 {
        unsigned long tmp = opcode & 0x1f;
-       unsigned long val;
+       long val;
 
-       csky_insn_reg_get_val(regs, tmp, &val);
+       csky_insn_reg_get_val(regs, tmp, (unsigned long *)&val);
 
        val -= 1;
 
@@ -286,7 +286,7 @@ simulate_bnezad32(u32 opcode, long addr, struct pt_regs *regs)
        } else
                instruction_pointer_set(regs, addr + 4);
 
-       csky_insn_reg_set_val(regs, tmp, val);
+       csky_insn_reg_set_val(regs, tmp, (unsigned long)val);
 }
 
 void __kprobes
@@ -297,13 +297,11 @@ simulate_bhsz32(u32 opcode, long addr, struct pt_regs *regs)
 
        csky_insn_reg_get_val(regs, tmp, &val);
 
-       if (val >= 0) {
+       if ((long) val >= 0) {
                instruction_pointer_set(regs,
                        addr + sign_extend32((opcode & 0xffff0000) >> 15, 15));
        } else
                instruction_pointer_set(regs, addr + 4);
-
-       csky_insn_reg_set_val(regs, tmp, val);
 }
 
 void __kprobes
@@ -314,13 +312,11 @@ simulate_bhz32(u32 opcode, long addr, struct pt_regs *regs)
 
        csky_insn_reg_get_val(regs, tmp, &val);
 
-       if (val > 0) {
+       if ((long) val > 0) {
                instruction_pointer_set(regs,
                        addr + sign_extend32((opcode & 0xffff0000) >> 15, 15));
        } else
                instruction_pointer_set(regs, addr + 4);
-
-       csky_insn_reg_set_val(regs, tmp, val);
 }
 
 void __kprobes
@@ -331,13 +327,11 @@ simulate_blsz32(u32 opcode, long addr, struct pt_regs *regs)
 
        csky_insn_reg_get_val(regs, tmp, &val);
 
-       if (val <= 0) {
+       if ((long) val <= 0) {
                instruction_pointer_set(regs,
                        addr + sign_extend32((opcode & 0xffff0000) >> 15, 15));
        } else
                instruction_pointer_set(regs, addr + 4);
-
-       csky_insn_reg_set_val(regs, tmp, val);
 }
 
 void __kprobes
@@ -348,13 +342,11 @@ simulate_blz32(u32 opcode, long addr, struct pt_regs *regs)
 
        csky_insn_reg_get_val(regs, tmp, &val);
 
-       if (val < 0) {
+       if ((long) val < 0) {
                instruction_pointer_set(regs,
                        addr + sign_extend32((opcode & 0xffff0000) >> 15, 15));
        } else
                instruction_pointer_set(regs, addr + 4);
-
-       csky_insn_reg_set_val(regs, tmp, val);
 }
 
 void __kprobes