From 3176cf67df774d7468de2618d69237a3dd17ff16 Mon Sep 17 00:00:00 2001
From: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Date: Wed, 8 Jun 2005 15:50:00 -0700
Subject: [PATCH] --- yaml --- r: 1911 b: refs/heads/master c:
 f829fd23c87918374bac0d90404fe12f0e788d52 h: refs/heads/master i:   1909:
 d2b825c41660a4141b5f5f3688e2b60d69d67636   1907:
 23ac090bb0ba5e372e8401e663181f54879ffbda   1903:
 1830a351121a56c38e719eb4d083d64544025e2a v: v3

---
 [refs]                            | 2 +-
 trunk/arch/ppc64/kernel/kprobes.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 498d48ae1159..b90e8409ebe5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63224d1e8b4cf87cc7420201a8cb3b44b9bf0b40
+refs/heads/master: f829fd23c87918374bac0d90404fe12f0e788d52
diff --git a/trunk/arch/ppc64/kernel/kprobes.c b/trunk/arch/ppc64/kernel/kprobes.c
index 8f3317244311..e950a2058a19 100644
--- a/trunk/arch/ppc64/kernel/kprobes.c
+++ b/trunk/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();