[PATCH 2/2] ppc64 kprobes: remove spurious MSR_SE masking

[Paul Mackerras]

From: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx>

Remove spurious MSR_SE reset during kprobe processing. single_step_exception()
already does it for us. Reset it to be safe when executing the fault_handler.

Signed-off-by: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
---

diff -urN linux-2.6/arch/ppc64/kernel/kprobes.c g5-ppc64/arch/ppc64/kernel/kprobes.c
--- linux-2.6/arch/ppc64/kernel/kprobes.c	2005-04-26 15:37:55.000000000 +1000
+++ g5-ppc64/arch/ppc64/kernel/kprobes.c	2005-06-07 21:06:38.000000000 +1000
@@ -177,8 +177,6 @@
 	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 @@
 
 	if (kprobe_status & KPROBE_HIT_SS) {
 		resume_execution(current_kprobe, regs);
+		regs->msr &= ~MSR_SE;
 		regs->msr |= kprobe_saved_msr;
 
 		unlock_kprobes();
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/