diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/arm/kernel/kprobes-decode.c | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'arch/arm/kernel/kprobes-decode.c')
| -rw-r--r-- | arch/arm/kernel/kprobes-decode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/kprobes-decode.c b/arch/arm/kernel/kprobes-decode.c index b4565bb133c1..da1f94906a4e 100644 --- a/arch/arm/kernel/kprobes-decode.c +++ b/arch/arm/kernel/kprobes-decode.c | |||
| @@ -488,7 +488,7 @@ static void __kprobes simulate_ldm1stm1(struct kprobe *p, struct pt_regs *regs) | |||
| 488 | 488 | ||
| 489 | if (!ubit) | 489 | if (!ubit) |
| 490 | addr -= reg_count; | 490 | addr -= reg_count; |
| 491 | addr += (!pbit ^ !ubit); | 491 | addr += (!pbit == !ubit); |
| 492 | 492 | ||
| 493 | reg_bit_vector = insn & 0xffff; | 493 | reg_bit_vector = insn & 0xffff; |
| 494 | while (reg_bit_vector) { | 494 | while (reg_bit_vector) { |
| @@ -503,7 +503,7 @@ static void __kprobes simulate_ldm1stm1(struct kprobe *p, struct pt_regs *regs) | |||
| 503 | if (wbit) { | 503 | if (wbit) { |
| 504 | if (!ubit) | 504 | if (!ubit) |
| 505 | addr -= reg_count; | 505 | addr -= reg_count; |
| 506 | addr -= (!pbit ^ !ubit); | 506 | addr -= (!pbit == !ubit); |
| 507 | regs->uregs[rn] = (long)addr; | 507 | regs->uregs[rn] = (long)addr; |
| 508 | } | 508 | } |
| 509 | } | 509 | } |