6 files changed, 11 insertions, 11 deletions

diff --git a/arch/x86_64/kernel/i387.c b/arch/x86_64/kernel/i387.c
index d9b22b633e39..a5d7e16b928e 100644
--- a/arch/x86_64/kernel/i387.c
+++ b/arch/x86_64/kernel/i387.c
@@ -95,7 +95,7 @@ int save_i387(struct _fpstate __user *buf)
         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 --git a/arch/x86_64/kernel/i8259.c b/arch/x86_64/kernel/i8259.c
index b61965f0fb34..5ecd34ab8c2b 100644
--- a/arch/x86_64/kernel/i8259.c
+++ b/arch/x86_64/kernel/i8259.c
@@ -133,7 +133,7 @@ static void end_8259A_irq (unsigned int irq)
 {
         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 --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c
index 669cf0ed3266..2ea4acd47fc2 100644
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86_64/kernel/process.c
@@ -463,7 +463,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long rsp,
         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 --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c
index c9e941ae5019..d16a2fae270a 100644
--- a/arch/x86_64/kernel/smpboot.c
+++ b/arch/x86_64/kernel/smpboot.c
@@ -814,7 +814,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 --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index 2671fd46ea85..d8f90b48aec4 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -308,7 +308,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
@@ -912,7 +912,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 --git a/include/asm-x86_64/i387.h b/include/asm-x86_64/i387.h
index 57f7e1433849..876eb9a2fe78 100644
--- a/include/asm-x86_64/i387.h
+++ b/include/asm-x86_64/i387.h
@@ -30,7 +30,7 @@ extern int save_i387(struct _fpstate __user *buf);
  */
 
 #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();
 }