---

yaml --- r: 232061 b: refs/heads/master c: e49b1fa h: refs/heads/master i: 232059: c13ca42 v: v3
git-mirror · Jan 21, 2011 · 90836bb · 90836bb
1 parent 428dd60
commit 90836bb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git 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
@@ -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
 	 *