diff options
author | Joe Perches <joe@perches.com> | 2008-03-23 04:03:43 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:28 -0400 |
commit | b98fff30223799c5df444fef1ebcfcddf310f740 (patch) | |
tree | f0723cc200e017dfdb0346f59dc41ad76bc63ca2 /include/asm-x86 | |
parent | 89917f28f3377fa7e38a51e9208e83b7b92542ee (diff) |
include/asm-x86/thread_info_64.h: checkpatch cleanups - formatting only
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86')
-rw-r--r-- | include/asm-x86/thread_info_64.h | 78 |
1 files changed, 41 insertions, 37 deletions
diff --git a/include/asm-x86/thread_info_64.h b/include/asm-x86/thread_info_64.h index 6c9b214b8fc3..1e5c6f6152cd 100644 --- a/include/asm-x86/thread_info_64.h +++ b/include/asm-x86/thread_info_64.h | |||
@@ -29,9 +29,9 @@ struct thread_info { | |||
29 | __u32 flags; /* low level flags */ | 29 | __u32 flags; /* low level flags */ |
30 | __u32 status; /* thread synchronous flags */ | 30 | __u32 status; /* thread synchronous flags */ |
31 | __u32 cpu; /* current CPU */ | 31 | __u32 cpu; /* current CPU */ |
32 | int preempt_count; /* 0 => preemptable, <0 => BUG */ | 32 | int preempt_count; /* 0 => preemptable, |
33 | 33 | <0 => BUG */ | |
34 | mm_segment_t addr_limit; | 34 | mm_segment_t addr_limit; |
35 | struct restart_block restart_block; | 35 | struct restart_block restart_block; |
36 | #ifdef CONFIG_IA32_EMULATION | 36 | #ifdef CONFIG_IA32_EMULATION |
37 | void __user *sysenter_return; | 37 | void __user *sysenter_return; |
@@ -61,17 +61,17 @@ struct thread_info { | |||
61 | #define init_stack (init_thread_union.stack) | 61 | #define init_stack (init_thread_union.stack) |
62 | 62 | ||
63 | static inline struct thread_info *current_thread_info(void) | 63 | static inline struct thread_info *current_thread_info(void) |
64 | { | 64 | { |
65 | struct thread_info *ti; | 65 | struct thread_info *ti; |
66 | ti = (void *)(read_pda(kernelstack) + PDA_STACKOFFSET - THREAD_SIZE); | 66 | ti = (void *)(read_pda(kernelstack) + PDA_STACKOFFSET - THREAD_SIZE); |
67 | return ti; | 67 | return ti; |
68 | } | 68 | } |
69 | 69 | ||
70 | /* do not use in interrupt context */ | 70 | /* do not use in interrupt context */ |
71 | static inline struct thread_info *stack_thread_info(void) | 71 | static inline struct thread_info *stack_thread_info(void) |
72 | { | 72 | { |
73 | struct thread_info *ti; | 73 | struct thread_info *ti; |
74 | __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (~(THREAD_SIZE - 1))); | 74 | asm("andq %%rsp,%0; " : "=r" (ti) : "0" (~(THREAD_SIZE - 1))); |
75 | return ti; | 75 | return ti; |
76 | } | 76 | } |
77 | 77 | ||
@@ -82,8 +82,8 @@ static inline struct thread_info *stack_thread_info(void) | |||
82 | #define THREAD_FLAGS GFP_KERNEL | 82 | #define THREAD_FLAGS GFP_KERNEL |
83 | #endif | 83 | #endif |
84 | 84 | ||
85 | #define alloc_thread_info(tsk) \ | 85 | #define alloc_thread_info(tsk) \ |
86 | ((struct thread_info *) __get_free_pages(THREAD_FLAGS, THREAD_ORDER)) | 86 | ((struct thread_info *)__get_free_pages(THREAD_FLAGS, THREAD_ORDER)) |
87 | 87 | ||
88 | #define free_thread_info(ti) free_pages((unsigned long) (ti), THREAD_ORDER) | 88 | #define free_thread_info(ti) free_pages((unsigned long) (ti), THREAD_ORDER) |
89 | 89 | ||
@@ -98,7 +98,8 @@ static inline struct thread_info *stack_thread_info(void) | |||
98 | 98 | ||
99 | /* | 99 | /* |
100 | * thread information flags | 100 | * thread information flags |
101 | * - these are process state flags that various assembly files may need to access | 101 | * - these are process state flags that various assembly files |
102 | * may need to access | ||
102 | * - pending work-to-be-done flags are in LSW | 103 | * - pending work-to-be-done flags are in LSW |
103 | * - other flags in MSW | 104 | * - other flags in MSW |
104 | * Warning: layout of LSW is hardcoded in entry.S | 105 | * Warning: layout of LSW is hardcoded in entry.S |
@@ -114,7 +115,7 @@ static inline struct thread_info *stack_thread_info(void) | |||
114 | #define TIF_MCE_NOTIFY 10 /* notify userspace of an MCE */ | 115 | #define TIF_MCE_NOTIFY 10 /* notify userspace of an MCE */ |
115 | #define TIF_HRTICK_RESCHED 11 /* reprogram hrtick timer */ | 116 | #define TIF_HRTICK_RESCHED 11 /* reprogram hrtick timer */ |
116 | /* 16 free */ | 117 | /* 16 free */ |
117 | #define TIF_IA32 17 /* 32bit process */ | 118 | #define TIF_IA32 17 /* 32bit process */ |
118 | #define TIF_FORK 18 /* ret_from_fork */ | 119 | #define TIF_FORK 18 /* ret_from_fork */ |
119 | #define TIF_ABI_PENDING 19 | 120 | #define TIF_ABI_PENDING 19 |
120 | #define TIF_MEMDIE 20 | 121 | #define TIF_MEMDIE 20 |
@@ -126,39 +127,40 @@ static inline struct thread_info *stack_thread_info(void) | |||
126 | #define TIF_DS_AREA_MSR 26 /* uses thread_struct.ds_area_msr */ | 127 | #define TIF_DS_AREA_MSR 26 /* uses thread_struct.ds_area_msr */ |
127 | #define TIF_BTS_TRACE_TS 27 /* record scheduling event timestamps */ | 128 | #define TIF_BTS_TRACE_TS 27 /* record scheduling event timestamps */ |
128 | 129 | ||
129 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) | 130 | #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) |
130 | #define _TIF_SIGPENDING (1<<TIF_SIGPENDING) | 131 | #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) |
131 | #define _TIF_SINGLESTEP (1<<TIF_SINGLESTEP) | 132 | #define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP) |
132 | #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED) | 133 | #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) |
133 | #define _TIF_IRET (1<<TIF_IRET) | 134 | #define _TIF_IRET (1 << TIF_IRET) |
134 | #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT) | 135 | #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) |
135 | #define _TIF_SECCOMP (1<<TIF_SECCOMP) | 136 | #define _TIF_SECCOMP (1 << TIF_SECCOMP) |
136 | #define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK) | 137 | #define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK) |
137 | #define _TIF_MCE_NOTIFY (1<<TIF_MCE_NOTIFY) | 138 | #define _TIF_MCE_NOTIFY (1 << TIF_MCE_NOTIFY) |
138 | #define _TIF_HRTICK_RESCHED (1<<TIF_HRTICK_RESCHED) | 139 | #define _TIF_HRTICK_RESCHED (1 << TIF_HRTICK_RESCHED) |
139 | #define _TIF_IA32 (1<<TIF_IA32) | 140 | #define _TIF_IA32 (1 << TIF_IA32) |
140 | #define _TIF_FORK (1<<TIF_FORK) | 141 | #define _TIF_FORK (1 << TIF_FORK) |
141 | #define _TIF_ABI_PENDING (1<<TIF_ABI_PENDING) | 142 | #define _TIF_ABI_PENDING (1 << TIF_ABI_PENDING) |
142 | #define _TIF_DEBUG (1<<TIF_DEBUG) | 143 | #define _TIF_DEBUG (1 << TIF_DEBUG) |
143 | #define _TIF_IO_BITMAP (1<<TIF_IO_BITMAP) | 144 | #define _TIF_IO_BITMAP (1 << TIF_IO_BITMAP) |
144 | #define _TIF_FREEZE (1<<TIF_FREEZE) | 145 | #define _TIF_FREEZE (1 << TIF_FREEZE) |
145 | #define _TIF_FORCED_TF (1<<TIF_FORCED_TF) | 146 | #define _TIF_FORCED_TF (1 << TIF_FORCED_TF) |
146 | #define _TIF_DEBUGCTLMSR (1<<TIF_DEBUGCTLMSR) | 147 | #define _TIF_DEBUGCTLMSR (1 << TIF_DEBUGCTLMSR) |
147 | #define _TIF_DS_AREA_MSR (1<<TIF_DS_AREA_MSR) | 148 | #define _TIF_DS_AREA_MSR (1 << TIF_DS_AREA_MSR) |
148 | #define _TIF_BTS_TRACE_TS (1<<TIF_BTS_TRACE_TS) | 149 | #define _TIF_BTS_TRACE_TS (1 << TIF_BTS_TRACE_TS) |
149 | 150 | ||
150 | /* work to do on interrupt/exception return */ | 151 | /* work to do on interrupt/exception return */ |
151 | #define _TIF_WORK_MASK \ | 152 | #define _TIF_WORK_MASK \ |
152 | (0x0000FFFF & ~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP|_TIF_SECCOMP)) | 153 | (0x0000FFFF & \ |
154 | ~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP|_TIF_SECCOMP)) | ||
153 | /* work to do on any return to user space */ | 155 | /* work to do on any return to user space */ |
154 | #define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP) | 156 | #define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP) |
155 | 157 | ||
156 | #define _TIF_DO_NOTIFY_MASK \ | 158 | #define _TIF_DO_NOTIFY_MASK \ |
157 | (_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED) | 159 | (_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED) |
158 | 160 | ||
159 | /* flags to check in __switch_to() */ | 161 | /* flags to check in __switch_to() */ |
160 | #define _TIF_WORK_CTXSW \ | 162 | #define _TIF_WORK_CTXSW \ |
161 | (_TIF_IO_BITMAP|_TIF_DEBUGCTLMSR|_TIF_DS_AREA_MSR|_TIF_BTS_TRACE_TS) | 163 | (_TIF_IO_BITMAP|_TIF_DEBUGCTLMSR|_TIF_DS_AREA_MSR|_TIF_BTS_TRACE_TS) |
162 | #define _TIF_WORK_CTXSW_PREV _TIF_WORK_CTXSW | 164 | #define _TIF_WORK_CTXSW_PREV _TIF_WORK_CTXSW |
163 | #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW|_TIF_DEBUG) | 165 | #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW|_TIF_DEBUG) |
164 | 166 | ||
@@ -171,9 +173,11 @@ static inline struct thread_info *stack_thread_info(void) | |||
171 | * ever touches our thread-synchronous status, so we don't | 173 | * ever touches our thread-synchronous status, so we don't |
172 | * have to worry about atomic accesses. | 174 | * have to worry about atomic accesses. |
173 | */ | 175 | */ |
174 | #define TS_USEDFPU 0x0001 /* FPU was used by this task this quantum (SMP) */ | 176 | #define TS_USEDFPU 0x0001 /* FPU was used by this task |
177 | this quantum (SMP) */ | ||
175 | #define TS_COMPAT 0x0002 /* 32bit syscall active */ | 178 | #define TS_COMPAT 0x0002 /* 32bit syscall active */ |
176 | #define TS_POLLING 0x0004 /* true if in idle loop and not sleeping */ | 179 | #define TS_POLLING 0x0004 /* true if in idle loop |
180 | and not sleeping */ | ||
177 | 181 | ||
178 | #define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING) | 182 | #define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING) |
179 | 183 | ||