diff --git a/[refs] b/[refs]
index c81f8186d685..f618077ce4d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3cdac41f2090ad9013dfefab7399b1debfb9275a
+refs/heads/master: 85c42d0dbb129b6bff560dacabec753677d64081
diff --git a/trunk/arch/x86/kernel/vmlinux_64.lds.S b/trunk/arch/x86/kernel/vmlinux_64.lds.S
index 5e9ec1b33c10..fab132299735 100644
--- a/trunk/arch/x86/kernel/vmlinux_64.lds.S
+++ b/trunk/arch/x86/kernel/vmlinux_64.lds.S
@@ -129,7 +129,7 @@ SECTIONS
 #undef VVIRT_OFFSET
 #undef VVIRT
 
-  . = ALIGN(8192);		/* init_task */
+  . = ALIGN(THREAD_SIZE);	/* init_task */
   .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) {
 	*(.data.init_task)
   }:data.init