diff options
| author | Masami Hiramatsu <mhiramat@redhat.com> | 2008-01-30 13:32:01 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:32:01 +0100 |
| commit | ddc66df876fd33d3956f3c3acc1ae334b16eedee (patch) | |
| tree | dec203db1d6e84669bd934bf64127501720f8e20 /arch/x86/kernel/kprobes.c | |
| parent | x86: voluntary leave_mm before entering ACPI C3 (diff) | |
| download | linux-ddc66df876fd33d3956f3c3acc1ae334b16eedee.tar.xz linux-ddc66df876fd33d3956f3c3acc1ae334b16eedee.zip | |
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/x86/kernel/kprobes.c')
| -rw-r--r-- | arch/x86/kernel/kprobes.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c index 521a469acaad..f0f2b98b9e20 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 |