---
 include/asm-x86/thread_info.h |   21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

Index: linux-2.6.25-mm1/include/asm-x86/thread_info.h
===================================================================
--- linux-2.6.25-mm1.orig/include/asm-x86/thread_info.h	2008-04-26 20:16:43.543639422 -0700
+++ linux-2.6.25-mm1/include/asm-x86/thread_info.h	2008-04-26 20:17:32.053639816 -0700
@@ -180,21 +180,6 @@ static inline struct thread_info *curren
 #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 TS_RESTORE_SIGMASK	0x0004	/* restore signal mask in do_signal() */
-
-#define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)
-
 #else /* X86_32 */
 
 #include <asm/pda.h>
@@ -350,6 +335,8 @@ static inline struct thread_info *stack_
 
 #define PREEMPT_ACTIVE     0x10000000
 
+#endif /* X86_64 */
+
 /*
  * Thread-synchronous status.
  *
@@ -359,15 +346,13 @@ static inline struct thread_info *stack_
  */
 #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 TS_RESTORE_SIGMASK	0x0008	/* restore signal mask in do_signal() */
 
 #define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)
 
-#endif /* X86_64 */
-
 #ifndef __ASSEMBLY__
 #define HAVE_SET_RESTORE_SIGMASK	1
 static inline void set_restore_sigmask(void)