---

yaml --- r: 209182 b: refs/heads/master c: 9605456 h: refs/heads/master v: v3
git-mirror · Aug 13, 2010 · e308d5f · e308d5f
1 parent c42b061
commit e308d5f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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))