1 files changed, 2 insertions, 1 deletions

diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index 160ae0fa7d0d..fc4343514bed 100644
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -305,16 +305,17 @@ int kprobe_handler(struct pt_regs *regs)
                         save_previous_kprobe(kcb);
                         set_current_kprobe(p, regs, kcb);
                         kprobes_inc_nmissed_count(p);
-                        prepare_singlestep(p, regs);
                         kcb->kprobe_status = KPROBE_REENTER;
                         if (p->ainsn.boostable >= 0) {
                                 ret = try_to_emulate(p, regs);
 
                                 if (ret > 0) {
                                         restore_previous_kprobe(kcb);
+                                        preempt_enable_no_resched();
                                         return 1;
                                 }
                         }
+                        prepare_singlestep(p, regs);
                         return 1;
                 } else {
                         if (*addr != BREAKPOINT_INSTRUCTION) {