x86: fix kprobe_handler reenable preemption

[pandora-kernel.git] / arch / x86 / kernel / kprobes.c

diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
index 521a469..f0f2b98 100644 (file)
--- a/arch/x86/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes.c
@@ -467,7 +467,8 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
                                arch_disarm_kprobe(p);
                                regs->ip = (unsigned long)p->addr;
                                reset_current_kprobe();
-                               return 1;
+                               ret = 1;
+                               goto no_kprobe;
 #endif
                        }
                        /* We have reentered the kprobe_handler(), since