diff --git a/[refs] b/[refs]
index 14be1352a32e..ed11f6dd9d2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2052e8d40ad58b1d364f900e70edfda62caa0874
+refs/heads/master: 12a638e13c68bbe187782518dab375f4fa800fc4
diff --git a/trunk/include/asm-x86/thread_info.h b/trunk/include/asm-x86/thread_info.h
index d59384ac0ba6..d2dc1a3b5d65 100644
--- a/trunk/include/asm-x86/thread_info.h
+++ b/trunk/include/asm-x86/thread_info.h
@@ -7,9 +7,11 @@
 #ifndef _ASM_X86_THREAD_INFO_H
 #define _ASM_X86_THREAD_INFO_H
 
-#ifdef CONFIG_X86_32
 #include <linux/compiler.h>
 #include <asm/page.h>
+#include <asm/types.h>
+
+#ifdef CONFIG_X86_32
 
 #ifndef __ASSEMBLY__
 #include <asm/processor.h>
@@ -192,8 +194,6 @@ static inline struct thread_info *current_thread_info(void)
 
 #else /* X86_32 */
 
-#include <asm/page.h>
-#include <asm/types.h>
 #include <asm/pda.h>
 
 /*