From 90836bb55725d84d2d42c3ffc1cc1f1ef2889986 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Tue, 11 Jan 2011 19:48:14 +0000
Subject: [PATCH] --- yaml --- r: 232061 b: refs/heads/master c:
 e49b1fae0ba4d06b29bd753a961abb447566bf4a h: refs/heads/master i:   232059:
 c13ca42ac5d34c801f1406cd2563711814eeee83 v: v3

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

diff --git a/[refs] b/[refs]
index 6195932405d1..8de685459509 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfb5509f8f49ffd52922060c830978ed5a9b9731
+refs/heads/master: e49b1fae0ba4d06b29bd753a961abb447566bf4a
diff --git a/trunk/arch/powerpc/kernel/traps.c b/trunk/arch/powerpc/kernel/traps.c
index 9e24224962d9..bd74fac169be 100644
--- a/trunk/arch/powerpc/kernel/traps.c
+++ b/trunk/arch/powerpc/kernel/traps.c
@@ -626,11 +626,6 @@ void machine_check_exception(struct pt_regs *regs)
 	if (recover > 0)
 		return;
 
-	if (user_mode(regs)) {
-		_exception(SIGBUS, regs, BUS_ADRERR, regs->nip);
-		return;
-	}
-
 #if defined(CONFIG_8xx) && defined(CONFIG_PCI)
 	/* the qspan pci read routines can cause machine checks -- Cort
 	 *