Skip to content

L
linux-davinci
Commit b4f4919b authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files
Options

powerpc: kprobes: Fix missed preemption check 

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 5b659531
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
arch/powerpc/kernel/kprobes.c
View file @ b4f4919b
...@@ -263,7 +263,7 @@ ss_probe: ...@@ -263,7 +263,7 @@ ss_probe:
kcb->kprobe_status = KPROBE_HIT_SSDONE; kcb->kprobe_status = KPROBE_HIT_SSDONE;
reset_current_kprobe(); reset_current_kprobe();
preempt_enable_no_resched(); preempt_enable();
return 1; return 1;
} else if (ret < 0) { } else if (ret < 0) {
/* /*
...@@ -282,7 +282,7 @@ ss_probe: ...@@ -282,7 +282,7 @@ ss_probe:
return 1; return 1;
no_kprobe: no_kprobe:
preempt_enable_no_resched(); preempt_enable();
return ret; return ret;
} }
...@@ -412,7 +412,7 @@ static int __kprobes post_kprobe_handler(struct pt_regs *regs) ...@@ -412,7 +412,7 @@ static int __kprobes post_kprobe_handler(struct pt_regs *regs)
} }
reset_current_kprobe(); reset_current_kprobe();
out: out:
preempt_enable_no_resched(); preempt_enable();
/* /*
* if somebody else is singlestepping across a probe point, msr * if somebody else is singlestepping across a probe point, msr
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment