Commit 89917f28 authored by Joe Perches's avatar Joe Perches Committed by Ingo Molnar

include/asm-x86/thread_info_32.h: checkpatch cleanups - formatting only

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 7c4d4784
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
* low level task data that entry.S needs immediate access to * low level task data that entry.S needs immediate access to
* - this struct should fit entirely inside of one cache line * - this struct should fit entirely inside of one cache line
* - this struct shares the supervisor stack pages * - this struct shares the supervisor stack pages
* - if the contents of this structure are changed, the assembly constants must also be changed * - if the contents of this structure are changed,
* the assembly constants must also be changed
*/ */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
...@@ -30,18 +31,16 @@ struct thread_info { ...@@ -30,18 +31,16 @@ struct thread_info {
unsigned long flags; /* low level flags */ unsigned long flags; /* low level flags */
unsigned long status; /* thread-synchronous flags */ unsigned long status; /* thread-synchronous flags */
__u32 cpu; /* current CPU */ __u32 cpu; /* current CPU */
int preempt_count; /* 0 => preemptable, <0 => BUG */ int preempt_count; /* 0 => preemptable,
<0 => BUG */
mm_segment_t addr_limit; /* thread address space: mm_segment_t addr_limit; /* thread address space:
0-0xBFFFFFFF for user-thead 0-0xBFFFFFFF user-thread
0-0xFFFFFFFF for kernel-thread 0-0xFFFFFFFF kernel-thread
*/ */
void *sysenter_return; void *sysenter_return;
struct restart_block restart_block; struct restart_block restart_block;
unsigned long previous_esp; /* ESP of the previous stack in
unsigned long previous_esp; /* ESP of the previous stack in case case of nested (IRQ) stacks
of nested (IRQ) stacks
*/ */
__u8 supervisor_stack[0]; __u8 supervisor_stack[0];
}; };
...@@ -90,15 +89,16 @@ register unsigned long current_stack_pointer asm("esp") __used; ...@@ -90,15 +89,16 @@ register unsigned long current_stack_pointer asm("esp") __used;
/* how to get the thread information struct from C */ /* how to get the thread information struct from C */
static inline struct thread_info *current_thread_info(void) static inline struct thread_info *current_thread_info(void)
{ {
return (struct thread_info *)(current_stack_pointer & ~(THREAD_SIZE - 1)); return (struct thread_info *)
(current_stack_pointer & ~(THREAD_SIZE - 1));
} }
/* thread information allocation */ /* thread information allocation */
#ifdef CONFIG_DEBUG_STACK_USAGE #ifdef CONFIG_DEBUG_STACK_USAGE
#define alloc_thread_info(tsk) ((struct thread_info *) \ #define alloc_thread_info(tsk) ((struct thread_info *) \
__get_free_pages(GFP_KERNEL| __GFP_ZERO, get_order(THREAD_SIZE))) __get_free_pages(GFP_KERNEL | __GFP_ZERO, get_order(THREAD_SIZE)))
#else #else
#define alloc_thread_info(tsk) ((struct thread_info *) \ #define alloc_thread_info(tsk) ((struct thread_info *) \
__get_free_pages(GFP_KERNEL, get_order(THREAD_SIZE))) __get_free_pages(GFP_KERNEL, get_order(THREAD_SIZE)))
#endif #endif
...@@ -107,7 +107,7 @@ static inline struct thread_info *current_thread_info(void) ...@@ -107,7 +107,7 @@ static inline struct thread_info *current_thread_info(void)
#else /* !__ASSEMBLY__ */ #else /* !__ASSEMBLY__ */
/* how to get the thread information struct from ASM */ /* how to get the thread information struct from ASM */
#define GET_THREAD_INFO(reg) \ #define GET_THREAD_INFO(reg) \
movl $-THREAD_SIZE, reg; \ movl $-THREAD_SIZE, reg; \
andl %esp, reg andl %esp, reg
...@@ -119,14 +119,16 @@ static inline struct thread_info *current_thread_info(void) ...@@ -119,14 +119,16 @@ static inline struct thread_info *current_thread_info(void)
/* /*
* thread information flags * thread information flags
* - these are process state flags that various assembly files may need to access * - these are process state flags that various
* assembly files may need to access
* - pending work-to-be-done flags are in LSW * - pending work-to-be-done flags are in LSW
* - other flags in MSW * - other flags in MSW
*/ */
#define TIF_SYSCALL_TRACE 0 /* syscall trace active */ #define TIF_SYSCALL_TRACE 0 /* syscall trace active */
#define TIF_SIGPENDING 1 /* signal pending */ #define TIF_SIGPENDING 1 /* signal pending */
#define TIF_NEED_RESCHED 2 /* rescheduling necessary */ #define TIF_NEED_RESCHED 2 /* rescheduling necessary */
#define TIF_SINGLESTEP 3 /* restore singlestep on return to user mode */ #define TIF_SINGLESTEP 3 /* restore singlestep on return to
user mode */
#define TIF_IRET 4 /* return with iret */ #define TIF_IRET 4 /* return with iret */
#define TIF_SYSCALL_EMU 5 /* syscall emulation active */ #define TIF_SYSCALL_EMU 5 /* syscall emulation active */
#define TIF_SYSCALL_AUDIT 6 /* syscall auditing active */ #define TIF_SYSCALL_AUDIT 6 /* syscall auditing active */
...@@ -143,36 +145,36 @@ static inline struct thread_info *current_thread_info(void) ...@@ -143,36 +145,36 @@ static inline struct thread_info *current_thread_info(void)
#define TIF_DS_AREA_MSR 23 /* uses thread_struct.ds_area_msr */ #define TIF_DS_AREA_MSR 23 /* uses thread_struct.ds_area_msr */
#define TIF_BTS_TRACE_TS 24 /* record scheduling event timestamps */ #define TIF_BTS_TRACE_TS 24 /* record scheduling event timestamps */
#define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
#define _TIF_SIGPENDING (1<<TIF_SIGPENDING) #define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
#define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED) #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
#define _TIF_SINGLESTEP (1<<TIF_SINGLESTEP) #define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP)
#define _TIF_IRET (1<<TIF_IRET) #define _TIF_IRET (1 << TIF_IRET)
#define _TIF_SYSCALL_EMU (1<<TIF_SYSCALL_EMU) #define _TIF_SYSCALL_EMU (1 << TIF_SYSCALL_EMU)
#define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT) #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT)
#define _TIF_SECCOMP (1<<TIF_SECCOMP) #define _TIF_SECCOMP (1 << TIF_SECCOMP)
#define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK) #define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK)
#define _TIF_HRTICK_RESCHED (1<<TIF_HRTICK_RESCHED) #define _TIF_HRTICK_RESCHED (1 << TIF_HRTICK_RESCHED)
#define _TIF_DEBUG (1<<TIF_DEBUG) #define _TIF_DEBUG (1 << TIF_DEBUG)
#define _TIF_IO_BITMAP (1<<TIF_IO_BITMAP) #define _TIF_IO_BITMAP (1 << TIF_IO_BITMAP)
#define _TIF_FREEZE (1<<TIF_FREEZE) #define _TIF_FREEZE (1 << TIF_FREEZE)
#define _TIF_NOTSC (1<<TIF_NOTSC) #define _TIF_NOTSC (1 << TIF_NOTSC)
#define _TIF_FORCED_TF (1<<TIF_FORCED_TF) #define _TIF_FORCED_TF (1 << TIF_FORCED_TF)
#define _TIF_DEBUGCTLMSR (1<<TIF_DEBUGCTLMSR) #define _TIF_DEBUGCTLMSR (1 << TIF_DEBUGCTLMSR)
#define _TIF_DS_AREA_MSR (1<<TIF_DS_AREA_MSR) #define _TIF_DS_AREA_MSR (1 << TIF_DS_AREA_MSR)
#define _TIF_BTS_TRACE_TS (1<<TIF_BTS_TRACE_TS) #define _TIF_BTS_TRACE_TS (1 << TIF_BTS_TRACE_TS)
/* work to do on interrupt/exception return */ /* work to do on interrupt/exception return */
#define _TIF_WORK_MASK \ #define _TIF_WORK_MASK \
(0x0000FFFF & ~(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \ (0x0000FFFF & ~(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
_TIF_SECCOMP | _TIF_SYSCALL_EMU)) _TIF_SECCOMP | _TIF_SYSCALL_EMU))
/* work to do on any return to u-space */ /* work to do on any return to u-space */
#define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP) #define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP)
/* flags to check in __switch_to() */ /* flags to check in __switch_to() */
#define _TIF_WORK_CTXSW \ #define _TIF_WORK_CTXSW \
(_TIF_IO_BITMAP | _TIF_NOTSC | _TIF_DEBUGCTLMSR | \ (_TIF_IO_BITMAP | _TIF_NOTSC | _TIF_DEBUGCTLMSR | \
_TIF_DS_AREA_MSR | _TIF_BTS_TRACE_TS) _TIF_DS_AREA_MSR | _TIF_BTS_TRACE_TS)
#define _TIF_WORK_CTXSW_PREV _TIF_WORK_CTXSW #define _TIF_WORK_CTXSW_PREV _TIF_WORK_CTXSW
#define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW | _TIF_DEBUG) #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW | _TIF_DEBUG)
...@@ -184,8 +186,10 @@ static inline struct thread_info *current_thread_info(void) ...@@ -184,8 +186,10 @@ static inline struct thread_info *current_thread_info(void)
* ever touches our thread-synchronous status, so we don't * ever touches our thread-synchronous status, so we don't
* have to worry about atomic accesses. * have to worry about atomic accesses.
*/ */
#define TS_USEDFPU 0x0001 /* FPU was used by this task this quantum (SMP) */ #define TS_USEDFPU 0x0001 /* FPU was used by this task
#define TS_POLLING 0x0002 /* True if in idle loop and not sleeping */ this quantum (SMP) */
#define TS_POLLING 0x0002 /* True if in idle loop
and not sleeping */
#define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING) #define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment