From 66587f1de7310e965b215f2d0026635ec47d2f1a Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Thu, 21 Aug 2008 23:22:49 +0100 Subject: [PATCH] --- yaml --- r: 112279 b: refs/heads/master c: 2d4b6c9aeb94cb9cb5c250f23e81e6d00b461372 h: refs/heads/master i: 112277: b21868287097531c23e2e4b7456dda6ea26d2da7 112275: 1b778058c797a670c96b05f485c81c6e079b5e3a 112271: db6f9076d9fcabbfe8cf293fcfebccac28bc4550 v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/kprobes-decode.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a4c16bf4c75b..696fcc580aa5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d81030a1badb4e4d08358ff2c2bda9b11d5a6559 +refs/heads/master: 2d4b6c9aeb94cb9cb5c250f23e81e6d00b461372 diff --git a/trunk/arch/arm/kernel/kprobes-decode.c b/trunk/arch/arm/kernel/kprobes-decode.c index b4565bb133c1..da1f94906a4e 100644 --- a/trunk/arch/arm/kernel/kprobes-decode.c +++ b/trunk/arch/arm/kernel/kprobes-decode.c @@ -488,7 +488,7 @@ static void __kprobes simulate_ldm1stm1(struct kprobe *p, struct pt_regs *regs) if (!ubit) addr -= reg_count; - addr += (!pbit ^ !ubit); + addr += (!pbit == !ubit); reg_bit_vector = insn & 0xffff; while (reg_bit_vector) { @@ -503,7 +503,7 @@ static void __kprobes simulate_ldm1stm1(struct kprobe *p, struct pt_regs *regs) if (wbit) { if (!ubit) addr -= reg_count; - addr -= (!pbit ^ !ubit); + addr -= (!pbit == !ubit); regs->uregs[rn] = (long)addr; } }