x86: threadinfo: merge thread sync state definitions
Merge both. x86_64 has an additional TS_COMPAT that is harmless
for 32 bit.
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 d2dc1a3..4b91f59d 100644
--- a/include/asm-x86/thread_info.h
+++ b/include/asm-x86/thread_info.h
@@ -177,21 +177,6 @@
#define _TIF_WORK_CTXSW_PREV _TIF_WORK_CTXSW
#define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW | _TIF_DEBUG)
-
-/*
- * Thread-synchronous status.
- *
- * This is different from the flags in that nobody else
- * ever touches our thread-synchronous status, so we don't
- * have to worry about atomic accesses.
- */
-#define TS_USEDFPU 0x0001 /* FPU was used by this task
- this quantum (SMP) */
-#define TS_POLLING 0x0002 /* True if in idle loop
- and not sleeping */
-
-#define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)
-
#else /* X86_32 */
#include <asm/pda.h>
@@ -349,6 +334,8 @@
#define PREEMPT_ACTIVE 0x10000000
+#endif /* !X86_32 */
+
/*
* Thread-synchronous status.
*
@@ -358,15 +345,12 @@
*/
#define TS_USEDFPU 0x0001 /* FPU was used by this task
this quantum (SMP) */
-#define TS_COMPAT 0x0002 /* 32bit syscall active */
+#define TS_COMPAT 0x0002 /* 32bit syscall active (64BIT)*/
#define TS_POLLING 0x0004 /* true if in idle loop
and not sleeping */
#define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)
-#endif /* !X86_32 */
-
-
#ifndef __ASSEMBLY__
extern void arch_task_cache_init(void);
extern void free_thread_info(struct thread_info *ti);