diff --git a/[refs] b/[refs]
index b10dcf51ac9e..809b6306c5f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d951734654f76a370a89b4e531af9b765bd13541
+refs/heads/master: 7c178a26d3e753d2a4346d3e4b8aa549d387f698
diff --git a/trunk/arch/x86/mm/fault.c b/trunk/arch/x86/mm/fault.c
index 6fa9f175cba3..f195691ec26e 100644
--- a/trunk/arch/x86/mm/fault.c
+++ b/trunk/arch/x86/mm/fault.c
@@ -960,11 +960,7 @@ access_error(unsigned long error_code, int write, struct vm_area_struct *vma)
 
 static int fault_in_kernel_space(unsigned long address)
 {
-#ifdef CONFIG_X86_32
-	return address >= TASK_SIZE;
-#else
 	return address >= TASK_SIZE_MAX;
-#endif
 }
 
 /*