Merge branch 'kprobes' of git://git.linaro.org/people/nico/linux into fixes

This commit is contained in:
Russell King
2011-04-29 11:02:45 +01:00
3 changed files with 470 additions and 329 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -134,7 +134,8 @@ static void __kprobes singlestep(struct kprobe *p, struct pt_regs *regs,
struct kprobe_ctlblk *kcb)
{
regs->ARM_pc += 4;
p->ainsn.insn_handler(p, regs);
if (p->ainsn.insn_check_cc(regs->ARM_cpsr))
p->ainsn.insn_handler(p, regs);
}
/*