From: Christoph Lameter <clameter@sgi.com>
Date: Tue, 29 Apr 2008 01:52:37 +0000 (-0700)
Subject: x86: thread_info: PREEMPT_ACTIVE
X-Git-Tag: v2.6.27-rc1~1106^2~251^21~7
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=24e2de6e28a453cd114b06215df2f9931cd0c342;p=linux-2.6-omap-h63xx.git

x86: thread_info: PREEMPT_ACTIVE

Same for both 32 and 64 bit so simply put it in to the common area.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/include/asm-x86/thread_info.h b/include/asm-x86/thread_info.h
index 8cd52d4bfb0..f8d5cf516ac 100644
--- a/include/asm-x86/thread_info.h
+++ b/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 */
 
 /*