diff --git a/[refs] b/[refs]
index 124d8d441179..ffda8485f826 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10ffdbb8d605be88b148f127ec86452f1364d4f0
+refs/heads/master: 637716a3825e186555361574aa1fa3c0ebf8018b
diff --git a/trunk/include/asm-x86_64/processor.h b/trunk/include/asm-x86_64/processor.h
index f0581c35628e..9f74a286ef11 100644
--- a/trunk/include/asm-x86_64/processor.h
+++ b/trunk/include/asm-x86_64/processor.h
@@ -159,9 +159,9 @@ static inline void clear_in_cr4 (unsigned long mask)
 
 
 /*
- * User space process size. 47bits.
+ * User space process size. 47bits minus one guard page.
  */
-#define TASK_SIZE	(0x800000000000UL)
+#define TASK_SIZE	(0x800000000000UL - 4096)
 
 /* This decides where the kernel will search for a free chunk of vm
  * space during mmap's.