Skip to content

Commit

Permalink
[PATCH] i386: task_thread_info()
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Jan 12, 2006
1 parent 57eafdc commit 06b425d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions arch/i386/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -601,8 +601,8 @@ static inline void disable_tsc(struct task_struct *prev_p,
* gcc should eliminate the ->thread_info dereference if
* has_secure_computing returns 0 at compile time (SECCOMP=n).
*/
prev = prev_p->thread_info;
next = next_p->thread_info;
prev = task_thread_info(prev_p);
next = task_thread_info(next_p);

if (has_secure_computing(prev) || has_secure_computing(next)) {
/* slow path here */
Expand Down
2 changes: 1 addition & 1 deletion arch/i386/kernel/vm86.c
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
"movl %1,%%ebp\n\t"
"jmp resume_userspace"
: /* no outputs */
:"r" (&info->regs), "r" (tsk->thread_info) : "ax");
:"r" (&info->regs), "r" (task_thread_info(tsk)) : "ax");
/* we never return here */
}

Expand Down
8 changes: 4 additions & 4 deletions include/asm-i386/i387.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,19 @@ static inline void __save_init_fpu( struct task_struct *tsk )
X86_FEATURE_FXSR,
"m" (tsk->thread.i387.fxsave)
:"memory");
tsk->thread_info->status &= ~TS_USEDFPU;
task_thread_info(tsk)->status &= ~TS_USEDFPU;
}

#define __unlazy_fpu( tsk ) do { \
if ((tsk)->thread_info->status & TS_USEDFPU) \
if (task_thread_info(tsk)->status & TS_USEDFPU) \
save_init_fpu( tsk ); \
} while (0)

#define __clear_fpu( tsk ) \
do { \
if ((tsk)->thread_info->status & TS_USEDFPU) { \
if (task_thread_info(tsk)->status & TS_USEDFPU) { \
asm volatile("fnclex ; fwait"); \
(tsk)->thread_info->status &= ~TS_USEDFPU; \
task_thread_info(tsk)->status &= ~TS_USEDFPU; \
stts(); \
} \
} while (0)
Expand Down

0 comments on commit 06b425d

Please sign in to comment.