1 files changed, 1 insertions, 2 deletions

diff --git a/arch/ppc64/kernel/kprobes.c b/arch/ppc64/kernel/kprobes.c
index 8f3317244311..e950a2058a19 100644
--- a/arch/ppc64/kernel/kprobes.c
+++ b/arch/ppc64/kernel/kprobes.c
@@ -177,8 +177,6 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs)
         ret = emulate_step(regs, p->ainsn.insn[0]);
         if (ret == 0)
                 regs->nip = (unsigned long)p->addr + 4;
-
-        regs->msr &= ~MSR_SE;
 }
 
 static inline int post_kprobe_handler(struct pt_regs *regs)
@@ -215,6 +213,7 @@ static inline int kprobe_fault_handler(struct pt_regs *regs, int trapnr)
 
         if (kprobe_status & KPROBE_HIT_SS) {
                 resume_execution(current_kprobe, regs);
+                regs->msr &= ~MSR_SE;
                 regs->msr |= kprobe_saved_msr;
 
                 unlock_kprobes();