| From b4f4919b32aeadc6e0c1a0bc996e541073e0bcf7 Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Fri, 3 Jul 2009 08:44:55 -0500 |
| Subject: [PATCH] powerpc: kprobes: Fix missed preemption check |
| |
| commit b4f4919b32aeadc6e0c1a0bc996e541073e0bcf7 in tip. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c |
| index c932978..dcbf960 100644 |
| --- a/arch/powerpc/kernel/kprobes.c |
| +++ b/arch/powerpc/kernel/kprobes.c |
| @@ -263,7 +263,7 @@ ss_probe: |
| |
| kcb->kprobe_status = KPROBE_HIT_SSDONE; |
| reset_current_kprobe(); |
| - preempt_enable_no_resched(); |
| + preempt_enable(); |
| return 1; |
| } else if (ret < 0) { |
| /* |
| @@ -282,7 +282,7 @@ ss_probe: |
| return 1; |
| |
| no_kprobe: |
| - preempt_enable_no_resched(); |
| + preempt_enable(); |
| return ret; |
| } |
| |
| @@ -412,7 +412,7 @@ static int __kprobes post_kprobe_handler(struct pt_regs *regs) |
| } |
| reset_current_kprobe(); |
| out: |
| - preempt_enable_no_resched(); |
| + preempt_enable(); |
| |
| /* |
| * if somebody else is singlestepping across a probe point, msr |
| -- |
| 1.7.1.1 |
| |
