git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devicetree/arm-next' of git://git.secretlab.ca/git/linux-2.6 into devel...
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
kprobes.c
diff --git
a/arch/arm/kernel/kprobes.c
b/arch/arm/kernel/kprobes.c
index
2ba7deb
..
1656c87
100644
(file)
--- 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,
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);
}
/*