aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2008-04-28 21:52:37 -0400
committerIngo Molnar <mingo@elte.hu>2008-05-12 15:28:03 -0400
commit24e2de6e28a453cd114b06215df2f9931cd0c342 (patch)
tree03811390059d0cab4260d4d4af7b997aa564dacf /include
parent3351cc03c0762353225a79507e38db4c1e656d52 (diff)
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>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/thread_info.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-x86/thread_info.h b/include/asm-x86/thread_info.h
index 8cd52d4bfb0e..f8d5cf516ac4 100644
--- a/include/asm-x86/thread_info.h
+++ b/include/asm-x86/thread_info.h
@@ -62,9 +62,10 @@ struct thread_info {
62 62
63#endif 63#endif
64 64
65#define PREEMPT_ACTIVE 0x10000000
66
65#ifdef CONFIG_X86_32 67#ifdef CONFIG_X86_32
66 68
67#define PREEMPT_ACTIVE 0x10000000
68#ifdef CONFIG_4KSTACKS 69#ifdef CONFIG_4KSTACKS
69#define THREAD_SIZE (4096) 70#define THREAD_SIZE (4096)
70#else 71#else
@@ -286,8 +287,6 @@ static inline struct thread_info *stack_thread_info(void)
286#define _TIF_WORK_CTXSW_PREV _TIF_WORK_CTXSW 287#define _TIF_WORK_CTXSW_PREV _TIF_WORK_CTXSW
287#define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW|_TIF_DEBUG) 288#define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW|_TIF_DEBUG)
288 289
289#define PREEMPT_ACTIVE 0x10000000
290
291#endif /* !X86_32 */ 290#endif /* !X86_32 */
292 291
293/* 292/*