From 2f2a8fbb9f28b0a2be47dc3a074244c5cd1bc986 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Thu, 16 Jul 2009 16:00:49 +0200
Subject: [PATCH] --- yaml --- r: 155834 b: refs/heads/master c:
 f10eca6e107fd223c24393c09c40b916d2b3c427 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/arch/microblaze/mm/fault.c | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 36e66909fcef..a9e8b8521d3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f14d6f7c31c73a902a6b567dc719128e74603902
+refs/heads/master: f10eca6e107fd223c24393c09c40b916d2b3c427
diff --git a/trunk/arch/microblaze/mm/fault.c b/trunk/arch/microblaze/mm/fault.c
index 956607a63f4c..398c76117355 100644
--- a/trunk/arch/microblaze/mm/fault.c
+++ b/trunk/arch/microblaze/mm/fault.c
@@ -122,15 +122,10 @@ void do_page_fault(struct pt_regs *regs, unsigned long address,
 	}
 #endif /* CONFIG_KGDB */
 
-	if (in_atomic() || mm == NULL) {
-		/* FIXME */
-		if (kernel_mode(regs)) {
-			printk(KERN_EMERG
-				"Page fault in kernel mode - Oooou!!! pid %d\n",
-				current->pid);
-			_exception(SIGSEGV, regs, code, address);
-			return;
-		}
+	if (in_atomic() || !mm) {
+		if (kernel_mode(regs))
+			goto bad_area_nosemaphore;
+
 		/* in_atomic() in user mode is really bad,
 		   as is current->mm == NULL. */
 		printk(KERN_EMERG "Page fault in user mode with "