From e308d5f1c492dcad0f12166e09c1efca8c34295e Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Aug 2010 09:49:20 -0700
Subject: [PATCH] --- yaml --- r: 209182 b: refs/heads/master c:
 96054569190bdec375fe824e48ca1f4e3b53dd36 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/arch/x86/mm/fault.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 21b6cc085ada..38723621ec4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5528f9132cf65d4d892bcbc5684c61e7822b21e9
+refs/heads/master: 96054569190bdec375fe824e48ca1f4e3b53dd36
diff --git a/trunk/arch/x86/mm/fault.c b/trunk/arch/x86/mm/fault.c
index f62777940dfb..4c4508e8a204 100644
--- a/trunk/arch/x86/mm/fault.c
+++ b/trunk/arch/x86/mm/fault.c
@@ -802,8 +802,10 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
 	up_read(&mm->mmap_sem);
 
 	/* Kernel mode? Handle exceptions or die: */
-	if (!(error_code & PF_USER))
+	if (!(error_code & PF_USER)) {
 		no_context(regs, error_code, address);
+		return;
+	}
 
 	/* User-space => ok to do another page fault: */
 	if (is_prefetch(regs, error_code, address))