diff --git a/[refs] b/[refs]
index d2d60664e728..e6382544bf8a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3351cc03c0762353225a79507e38db4c1e656d52
+refs/heads/master: 24e2de6e28a453cd114b06215df2f9931cd0c342
diff --git a/trunk/include/asm-x86/thread_info.h b/trunk/include/asm-x86/thread_info.h
index 8cd52d4bfb0e..f8d5cf516ac4 100644
--- a/trunk/include/asm-x86/thread_info.h
+++ b/trunk/include/asm-x86/thread_info.h
@@ -62,9 +62,10 @@ struct thread_info {
 
 #endif
 
+#define PREEMPT_ACTIVE		0x10000000
+
 #ifdef CONFIG_X86_32
 
-#define PREEMPT_ACTIVE		0x10000000
 #ifdef CONFIG_4KSTACKS
 #define THREAD_SIZE            (4096)
 #else
@@ -286,8 +287,6 @@ static inline struct thread_info *stack_thread_info(void)
 #define _TIF_WORK_CTXSW_PREV _TIF_WORK_CTXSW
 #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW|_TIF_DEBUG)
 
-#define PREEMPT_ACTIVE     0x10000000
-
 #endif /* !X86_32 */
 
 /*