aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMasami Hiramatsu <mhiramat@redhat.com>2008-01-30 13:32:01 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:32:01 +0100
commitddc66df876fd33d3956f3c3acc1ae334b16eedee (patch)
treedec203db1d6e84669bd934bf64127501720f8e20 /arch
parentbde6f5f59c2b2b48a7a849c129d5b48838fe77ee (diff)
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 <mhiramat@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/kprobes.c3
1 files changed, 2 insertions, 1 deletions
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