diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-20 11:01:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-20 11:01:29 +0200 |
| commit | d986434a7d32079cc6cbedcdb04d834aa9b323ff (patch) | |
| tree | cf1feb5139d76cef0446945b5cad741c47ae9d8d /include | |
| parent | 1b427c153a08fdbc092c2bdbf845b92fda58d857 (diff) | |
| parent | 31656519e132f6612584815f128c83976a9aaaef (diff) | |
| download | kernel_samsung_espresso10-d986434a7d32079cc6cbedcdb04d834aa9b323ff.zip kernel_samsung_espresso10-d986434a7d32079cc6cbedcdb04d834aa9b323ff.tar.gz kernel_samsung_espresso10-d986434a7d32079cc6cbedcdb04d834aa9b323ff.tar.bz2 | |
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 895339d..d701263 100644 --- a/include/asm-x86/thread_info.h +++ b/include/asm-x86/thread_info.h @@ -81,7 +81,6 @@ struct thread_info { #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */ #define TIF_SECCOMP 8 /* secure computing */ #define TIF_MCE_NOTIFY 10 /* notify userspace of an MCE */ -#define TIF_HRTICK_RESCHED 11 /* reprogram hrtick timer */ #define TIF_NOTSC 16 /* TSC is not accessible in userland */ #define TIF_IA32 17 /* 32bit process */ #define TIF_FORK 18 /* ret_from_fork */ @@ -108,7 +107,6 @@ struct thread_info { #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) #define _TIF_SECCOMP (1 << TIF_SECCOMP) #define _TIF_MCE_NOTIFY (1 << TIF_MCE_NOTIFY) -#define _TIF_HRTICK_RESCHED (1 << TIF_HRTICK_RESCHED) #define _TIF_NOTSC (1 << TIF_NOTSC) #define _TIF_IA32 (1 << TIF_IA32) #define _TIF_FORK (1 << TIF_FORK) @@ -132,7 +130,7 @@ struct thread_info { /* Only used for 64 bit */ #define _TIF_DO_NOTIFY_MASK \ - (_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED) + (_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY) /* flags to check in __switch_to() */ #define _TIF_WORK_CTXSW \ |