---

yaml --- r: 136939 b: refs/heads/master c: cd1b68f h: refs/heads/master i: 136937: 3eba558 136935: cfd6403 v: v3
git-mirror · Feb 20, 2009 · 92d2d38 · 92d2d38
1 parent 7390a1e
commit 92d2d38
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c178a26d3e753d2a4346d3e4b8aa549d387f698
+refs/heads/master: cd1b68f08f6328737928e5b8ba8ef80394680ff0
diff --git a/trunk/arch/x86/mm/fault.c b/trunk/arch/x86/mm/fault.c
@@ -836,11 +836,9 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address)
 	if (!(error_code & PF_USER))
 		no_context(regs, error_code, address);
 
-#ifdef CONFIG_X86_32
-	/* User space => ok to do another page fault: */
+	/* User-space => ok to do another page fault: */
 	if (is_prefetch(regs, error_code, address))
 		return;
-#endif
 
 	tsk->thread.cr2		= address;
 	tsk->thread.error_code	= error_code;