From: Al Viro Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- arch/x86_64/kernel/i387.c | 2 +- arch/x86_64/kernel/i8259.c | 2 +- arch/x86_64/kernel/process.c | 2 +- arch/x86_64/kernel/smpboot.c | 2 +- arch/x86_64/kernel/traps.c | 4 ++-- include/asm-x86_64/i387.h | 10 +++++----- 6 files changed, 11 insertions(+), 11 deletions(-) diff -puN arch/x86_64/kernel/i387.c~amd64-task_thread_info arch/x86_64/kernel/i387.c --- devel/arch/x86_64/kernel/i387.c~amd64-task_thread_info 2006-01-04 22:01:44.000000000 -0800 +++ devel-akpm/arch/x86_64/kernel/i387.c 2006-01-04 22:01:44.000000000 -0800 @@ -95,7 +95,7 @@ int save_i387(struct _fpstate __user *bu if (!used_math()) return 0; clear_used_math(); /* trigger finit */ - if (tsk->thread_info->status & TS_USEDFPU) { + if (task_thread_info(tsk)->status & TS_USEDFPU) { err = save_i387_checking((struct i387_fxsave_struct __user *)buf); if (err) return err; stts(); diff -puN arch/x86_64/kernel/i8259.c~amd64-task_thread_info arch/x86_64/kernel/i8259.c --- devel/arch/x86_64/kernel/i8259.c~amd64-task_thread_info 2006-01-04 22:01:44.000000000 -0800 +++ devel-akpm/arch/x86_64/kernel/i8259.c 2006-01-04 22:01:44.000000000 -0800 @@ -133,7 +133,7 @@ static void end_8259A_irq (unsigned int { if (irq > 256) { char var; - printk("return %p stack %p ti %p\n", __builtin_return_address(0), &var, current->thread_info); + printk("return %p stack %p ti %p\n", __builtin_return_address(0), &var, task_thread_info(current)); BUG(); } diff -puN arch/x86_64/kernel/process.c~amd64-task_thread_info arch/x86_64/kernel/process.c --- devel/arch/x86_64/kernel/process.c~amd64-task_thread_info 2006-01-04 22:01:44.000000000 -0800 +++ devel-akpm/arch/x86_64/kernel/process.c 2006-01-04 22:01:44.000000000 -0800 @@ -463,7 +463,7 @@ int copy_thread(int nr, unsigned long cl p->thread.rsp0 = (unsigned long) (childregs+1); p->thread.userrsp = me->thread.userrsp; - set_ti_thread_flag(p->thread_info, TIF_FORK); + set_tsk_thread_flag(p, TIF_FORK); p->thread.fs = me->thread.fs; p->thread.gs = me->thread.gs; diff -puN arch/x86_64/kernel/smpboot.c~amd64-task_thread_info arch/x86_64/kernel/smpboot.c --- devel/arch/x86_64/kernel/smpboot.c~amd64-task_thread_info 2006-01-04 22:01:44.000000000 -0800 +++ devel-akpm/arch/x86_64/kernel/smpboot.c 2006-01-04 22:01:44.000000000 -0800 @@ -799,7 +799,7 @@ do_rest: init_rsp = c_idle.idle->thread.rsp; per_cpu(init_tss,cpu).rsp0 = init_rsp; initial_code = start_secondary; - clear_ti_thread_flag(c_idle.idle->thread_info, TIF_FORK); + clear_tsk_thread_flag(c_idle.idle, TIF_FORK); printk(KERN_INFO "Booting processor %d/%d APIC 0x%x\n", cpu, cpus_weight(cpu_present_map), diff -puN arch/x86_64/kernel/traps.c~amd64-task_thread_info arch/x86_64/kernel/traps.c --- devel/arch/x86_64/kernel/traps.c~amd64-task_thread_info 2006-01-04 22:01:44.000000000 -0800 +++ devel-akpm/arch/x86_64/kernel/traps.c 2006-01-04 22:01:44.000000000 -0800 @@ -310,7 +310,7 @@ void show_registers(struct pt_regs *regs printk("CPU %d ", cpu); __show_regs(regs); printk("Process %s (pid: %d, threadinfo %p, task %p)\n", - cur->comm, cur->pid, cur->thread_info, cur); + cur->comm, cur->pid, task_thread_info(cur), cur); /* * When in-kernel, we also print out the stack and code at the @@ -914,7 +914,7 @@ asmlinkage void math_state_restore(void) if (!used_math()) init_fpu(me); restore_fpu_checking(&me->thread.i387.fxsave); - me->thread_info->status |= TS_USEDFPU; + task_thread_info(me)->status |= TS_USEDFPU; } void __init trap_init(void) diff -puN include/asm-x86_64/i387.h~amd64-task_thread_info include/asm-x86_64/i387.h --- devel/include/asm-x86_64/i387.h~amd64-task_thread_info 2006-01-04 22:01:44.000000000 -0800 +++ devel-akpm/include/asm-x86_64/i387.h 2006-01-04 22:01:44.000000000 -0800 @@ -30,7 +30,7 @@ extern int save_i387(struct _fpstate __u */ #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) @@ -46,9 +46,9 @@ static inline void tolerant_fwait(void) } #define clear_fpu(tsk) do { \ - if ((tsk)->thread_info->status & TS_USEDFPU) { \ + if (task_thread_info(tsk)->status & TS_USEDFPU) { \ tolerant_fwait(); \ - (tsk)->thread_info->status &= ~TS_USEDFPU; \ + task_thread_info(tsk)->status &= ~TS_USEDFPU; \ stts(); \ } \ } while (0) @@ -170,10 +170,10 @@ static inline void kernel_fpu_end(void) preempt_enable(); } -static inline void save_init_fpu( struct task_struct *tsk ) +static inline void save_init_fpu(struct task_struct *tsk) { __fxsave_clear(tsk); - tsk->thread_info->status &= ~TS_USEDFPU; + task_thread_info(tsk)->status &= ~TS_USEDFPU; stts(); } _