diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-20 05:01:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-20 05:01:29 -0400 |
| commit | d986434a7d32079cc6cbedcdb04d834aa9b323ff (patch) | |
| tree | cf1feb5139d76cef0446945b5cad741c47ae9d8d /include | |
| parent | 1b427c153a08fdbc092c2bdbf845b92fda58d857 (diff) | |
| parent | 31656519e132f6612584815f128c83976a9aaaef (diff) | |
Merge branch 'sched/urgent' into sched/devel
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/thread_info.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-x86/thread_info.h b/include/asm-x86/thread_info.h index 895339d2bc0b..d7012634ace4 100644 --- a/include/asm-x86/thread_info.h +++ b/include/asm-x86/thread_info.h | |||
| @@ -81,7 +81,6 @@ struct thread_info { | |||
| 81 | #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */ | 81 | #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */ |
| 82 | #define TIF_SECCOMP 8 /* secure computing */ | 82 | #define TIF_SECCOMP 8 /* secure computing */ |
| 83 | #define TIF_MCE_NOTIFY 10 /* notify userspace of an MCE */ | 83 | #define TIF_MCE_NOTIFY 10 /* notify userspace of an MCE */ |
| 84 | #define TIF_HRTICK_RESCHED 11 /* reprogram hrtick timer */ | ||
| 85 | #define TIF_NOTSC 16 /* TSC is not accessible in userland */ | 84 | #define TIF_NOTSC 16 /* TSC is not accessible in userland */ |
| 86 | #define TIF_IA32 17 /* 32bit process */ | 85 | #define TIF_IA32 17 /* 32bit process */ |
| 87 | #define TIF_FORK 18 /* ret_from_fork */ | 86 | #define TIF_FORK 18 /* ret_from_fork */ |
| @@ -108,7 +107,6 @@ struct thread_info { | |||
| 108 | #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) | 107 | #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) |
| 109 | #define _TIF_SECCOMP (1 << TIF_SECCOMP) | 108 | #define _TIF_SECCOMP (1 << TIF_SECCOMP) |
| 110 | #define _TIF_MCE_NOTIFY (1 << TIF_MCE_NOTIFY) | 109 | #define _TIF_MCE_NOTIFY (1 << TIF_MCE_NOTIFY) |
| 111 | #define _TIF_HRTICK_RESCHED (1 << TIF_HRTICK_RESCHED) | ||
| 112 | #define _TIF_NOTSC (1 << TIF_NOTSC) | 110 | #define _TIF_NOTSC (1 << TIF_NOTSC) |
| 113 | #define _TIF_IA32 (1 << TIF_IA32) | 111 | #define _TIF_IA32 (1 << TIF_IA32) |
| 114 | #define _TIF_FORK (1 << TIF_FORK) | 112 | #define _TIF_FORK (1 << TIF_FORK) |
| @@ -132,7 +130,7 @@ struct thread_info { | |||
| 132 | 130 | ||
| 133 | /* Only used for 64 bit */ | 131 | /* Only used for 64 bit */ |
| 134 | #define _TIF_DO_NOTIFY_MASK \ | 132 | #define _TIF_DO_NOTIFY_MASK \ |
| 135 | (_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED) | 133 | (_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY) |
| 136 | 134 | ||
| 137 | /* flags to check in __switch_to() */ | 135 | /* flags to check in __switch_to() */ |
| 138 | #define _TIF_WORK_CTXSW \ | 136 | #define _TIF_WORK_CTXSW \ |