From df94bde54891b4b2c5e510c061774d943380a2bf Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Tue, 11 Jan 2011 19:45:31 +0000
Subject: [PATCH] --- yaml --- r: 232058 b: refs/heads/master c:
 a443506b8598bbd784cfe403ad1db2c7083ff465 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/powerpc/kernel/traps.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6a9ab02823db..e2c71b03fc63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7071854bb248926b85141d791f9fa17901a6fa4b
+refs/heads/master: a443506b8598bbd784cfe403ad1db2c7083ff465
diff --git a/trunk/arch/powerpc/kernel/traps.c b/trunk/arch/powerpc/kernel/traps.c
index 1b2cdc8eec90..6865002df6ce 100644
--- a/trunk/arch/powerpc/kernel/traps.c
+++ b/trunk/arch/powerpc/kernel/traps.c
@@ -627,7 +627,6 @@ void machine_check_exception(struct pt_regs *regs)
 		return;
 
 	if (user_mode(regs)) {
-		regs->msr |= MSR_RI;
 		_exception(SIGBUS, regs, BUS_ADRERR, regs->nip);
 		return;
 	}
@@ -643,10 +642,8 @@ void machine_check_exception(struct pt_regs *regs)
 	return;
 #endif
 
-	if (debugger_fault_handler(regs)) {
-		regs->msr |= MSR_RI;
+	if (debugger_fault_handler(regs))
 		return;
-	}
 
 	if (check_io_access(regs))
 		return;