diff options
| author | Mathieu Desnoyers <compudj@krystal.dyndns.org> | 2008-01-31 01:27:57 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-31 01:27:57 +0300 |
| commit | 4bc408a5b9fed59f8b23ae81bab4e964726bd8b8 (patch) | |
| tree | 44f190a90eaf3d6ee25e698e84ea43c03f843ccb /include | |
| parent | dd430ca20c40ecccd6954a7efd13d4398f507728 (diff) | |
| download | linux-4bc408a5b9fed59f8b23ae81bab4e964726bd8b8.tar.xz | |
x86: fix duplicated TIF on 64-bit
commit 7e9916040b3020d0f36d68bb7512e3b80b623097
and commit eee3af4a2c83a97fff107ddc445d9df6fded9ce4
Both use the same TIF number (25) in thread_info_64.h.
This patch changes the TIF ids.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/thread_info_64.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/thread_info_64.h b/include/asm-x86/thread_info_64.h index 9b531ea015a8..6c9b214b8fc3 100644 --- a/include/asm-x86/thread_info_64.h +++ b/include/asm-x86/thread_info_64.h @@ -123,8 +123,8 @@ static inline struct thread_info *stack_thread_info(void) #define TIF_FREEZE 23 /* is freezing for suspend */ #define TIF_FORCED_TF 24 /* true if TF in eflags artificially */ #define TIF_DEBUGCTLMSR 25 /* uses thread_struct.debugctlmsr */ -#define TIF_DS_AREA_MSR 25 /* uses thread_struct.ds_area_msr */ -#define TIF_BTS_TRACE_TS 26 /* record scheduling event timestamps */ +#define TIF_DS_AREA_MSR 26 /* uses thread_struct.ds_area_msr */ +#define TIF_BTS_TRACE_TS 27 /* record scheduling event timestamps */ #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) #define _TIF_SIGPENDING (1<<TIF_SIGPENDING) |