From: Masami Hiramatsu Date: Wed, 30 Jan 2008 12:32:01 +0000 (+0100) Subject: x86: fix kprobe_handler reenable preemption X-Git-Tag: v2.6.25-rc1~1143^2~487 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ddc66df876fd33d3956f3c3acc1ae334b16eedee;p=linux-2.6-omap-h63xx.git x86: fix kprobe_handler reenable preemption Fix a preemption bug in kprobe_handler(). It has to call preempt_enable() before returning. Signed-off-by: Masami Hiramatsu Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c index 521a469acaa..f0f2b98b9e2 100644 --- 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