diff options
author | Clark Williams <williams@redhat.com> | 2012-02-29 09:50:56 -0600 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-02-29 09:50:56 -0600 |
commit | 5f269e50cb10cd1a74b89f7fda87b0c9082754f0 (patch) | |
tree | 76f82e09728bbed59baebcff2e0b008f0ab5eead /arch/x86/include/asm/thread_info.h | |
parent | a0c034c3726715d1928b301ddd43c51799c0c07a (diff) | |
parent | 1de504ea25617f701ac3a246a1c9dfd2246d4900 (diff) |
Merge commit 'v3.2.8' into rt-3.2.7-rt13v3.2.8-rt13
Conflicts:
arch/x86/kernel/process_32.c
Diffstat (limited to 'arch/x86/include/asm/thread_info.h')
-rw-r--r-- | arch/x86/include/asm/thread_info.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h index a1fe5c127b52..d7ef849714a1 100644 --- a/arch/x86/include/asm/thread_info.h +++ b/arch/x86/include/asm/thread_info.h @@ -242,8 +242,6 @@ static inline struct thread_info *current_thread_info(void) * 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_COMPAT 0x0002 /* 32bit syscall active (64BIT)*/ #define TS_POLLING 0x0004 /* idle task polling need_resched, skip sending interrupt */ |