From: Al Viro Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- arch/i386/kernel/process.c | 4 ++-- arch/i386/kernel/vm86.c | 2 +- include/asm-i386/i387.h | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff -puN arch/i386/kernel/process.c~i386-task_thread_info arch/i386/kernel/process.c --- devel/arch/i386/kernel/process.c~i386-task_thread_info 2006-01-04 22:01:50.000000000 -0800 +++ devel-akpm/arch/i386/kernel/process.c 2006-01-04 22:01:50.000000000 -0800 @@ -601,8 +601,8 @@ static inline void disable_tsc(struct ta * 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 */ diff -puN arch/i386/kernel/vm86.c~i386-task_thread_info arch/i386/kernel/vm86.c --- devel/arch/i386/kernel/vm86.c~i386-task_thread_info 2006-01-04 22:01:50.000000000 -0800 +++ devel-akpm/arch/i386/kernel/vm86.c 2006-01-04 22:01:50.000000000 -0800 @@ -310,7 +310,7 @@ static void do_sys_vm86(struct kernel_vm "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 */ } diff -puN include/asm-i386/i387.h~i386-task_thread_info include/asm-i386/i387.h --- devel/include/asm-i386/i387.h~i386-task_thread_info 2006-01-04 22:01:50.000000000 -0800 +++ devel-akpm/include/asm-i386/i387.h 2006-01-04 22:01:50.000000000 -0800 @@ -49,19 +49,19 @@ static inline void __save_init_fpu( stru 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) _