lkml.org 
[lkml]   [2008]   [Apr]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch 3/9] 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>

---
include/asm-x86/thread_info.h | 22 +++-------------------
1 file changed, 3 insertions(+), 19 deletions(-)
Index: linux-2.6/include/asm-x86/thread_info.h
===================================================================
--- linux-2.6.orig/include/asm-x86/thread_info.h 2008-04-28 17:45:31.632388749 -0700
+++ linux-2.6/include/asm-x86/thread_info.h 2008-04-28 17:47:10.563649517 -0700
@@ -177,21 +177,6 @@ static inline struct thread_info *curren
#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 @@ static inline struct thread_info *stack_

#define PREEMPT_ACTIVE 0x10000000

+#endif /* !X86_32 */
+
/*
* Thread-synchronous status.
*
@@ -358,15 +345,12 @@ 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 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);
--


\
 
 \ /
  Last update: 2008-04-29 03:57    [from the cache]
©2003-2011 Jasper Spaans