diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-29 06:02:45 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-29 06:02:45 -0400 |
| commit | 408133e9dca2b94c64b917b144ec816df913a94e (patch) | |
| tree | be456466d5413bac6de08bd3fea93857c7a1d27b /arch/arm/kernel/kprobes.c | |
| parent | ef267500094632e0b8229e284e7295ef858da362 (diff) | |
| parent | cdc253611582f08036ccb6e10efe95b8e760a7e2 (diff) | |
Merge branch 'kprobes' of git://git.linaro.org/people/nico/linux into fixes
Diffstat (limited to 'arch/arm/kernel/kprobes.c')
| -rw-r--r-- | arch/arm/kernel/kprobes.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/kprobes.c b/arch/arm/kernel/kprobes.c index 2ba7deb3072e..1656c87501c0 100644 --- a/arch/arm/kernel/kprobes.c +++ b/arch/arm/kernel/kprobes.c | |||
| @@ -134,7 +134,8 @@ static void __kprobes singlestep(struct kprobe *p, struct pt_regs *regs, | |||
| 134 | struct kprobe_ctlblk *kcb) | 134 | struct kprobe_ctlblk *kcb) |
| 135 | { | 135 | { |
| 136 | regs->ARM_pc += 4; | 136 | regs->ARM_pc += 4; |
| 137 | p->ainsn.insn_handler(p, regs); | 137 | if (p->ainsn.insn_check_cc(regs->ARM_cpsr)) |
| 138 | p->ainsn.insn_handler(p, regs); | ||
| 138 | } | 139 | } |
| 139 | 140 | ||
| 140 | /* | 141 | /* |