[PATCH] powerpc: task_thread_info()

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>

5 files changed, 9 insertions, 9 deletions

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 105d5609ff57..bc03526d25de 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -424,7 +424,7 @@ void show_regs(struct pt_regs * regs)
         if (trap == 0x300 || trap == 0x600)
                 printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr);
         printk("TASK = %p[%d] '%s' THREAD: %p",
-               current, current->pid, current->comm, current->thread_info);
+               current, current->pid, current->comm, task_thread_info(current));
 
 #ifdef CONFIG_SMP
         printk(" CPU: %d", smp_processor_id());
@@ -516,7 +516,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
 #ifdef CONFIG_PPC32
                 childregs->gpr[2] = (unsigned long) p;
 #else
-                clear_ti_thread_flag(p->thread_info, TIF_32BIT);
+                clear_tsk_thread_flag(p, TIF_32BIT);
 #endif
                 p->thread.regs = NULL;  /* no user register state */
         } else {
diff --git a/arch/powerpc/kernel/ptrace-common.h b/arch/powerpc/kernel/ptrace-common.h
index b1babb729673..5ccbdbe0d5c9 100644
--- a/arch/powerpc/kernel/ptrace-common.h
+++ b/arch/powerpc/kernel/ptrace-common.h
@@ -62,7 +62,7 @@ static inline void set_single_step(struct task_struct *task)
         struct pt_regs *regs = task->thread.regs;
         if (regs != NULL)
                 regs->msr |= MSR_SE;
-        set_ti_thread_flag(task->thread_info, TIF_SINGLESTEP);
+        set_tsk_thread_flag(task, TIF_SINGLESTEP);
 }
 
 static inline void clear_single_step(struct task_struct *task)
@@ -70,7 +70,7 @@ static inline void clear_single_step(struct task_struct *task)
         struct pt_regs *regs = task->thread.regs;
         if (regs != NULL)
                 regs->msr &= ~MSR_SE;
-        clear_ti_thread_flag(task->thread_info, TIF_SINGLESTEP);
+        clear_tsk_thread_flag(task, TIF_SINGLESTEP);
 }
 
 #ifdef CONFIG_ALTIVEC
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index d381ec90b759..c8458c531b25 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -338,8 +338,8 @@ static void __init smp_create_idle(unsigned int cpu)
 #ifdef CONFIG_PPC64
         paca[cpu].__current = p;
 #endif
-        current_set[cpu] = p->thread_info;
-        p->thread_info->cpu = cpu;
+        current_set[cpu] = task_thread_info(p);
+        task_thread_info(p)->cpu = cpu;
 }
 
 void __init smp_prepare_cpus(unsigned int max_cpus)
@@ -375,7 +375,7 @@ void __devinit smp_prepare_boot_cpu(void)
 #ifdef CONFIG_PPC64
         paca[boot_cpuid].__current = current;
 #endif
-        current_set[boot_cpuid] = current->thread_info;
+        current_set[boot_cpuid] = task_thread_info(current);
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c
index de96eadf419d..bdf6c5fe58c0 100644
--- a/arch/powerpc/platforms/cell/smp.c
+++ b/arch/powerpc/platforms/cell/smp.c
@@ -86,7 +86,7 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
         pcpu = get_hard_smp_processor_id(lcpu);
 
         /* Fixup atomic count: it exited inside IRQ handler. */
-        paca[lcpu].__current->thread_info->preempt_count        = 0;
+        task_thread_info(paca[lcpu].__current)->preempt_count   = 0;
 
         /*
          * If the RTAS start-cpu token does not exist then presume the
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index 25181c594d73..2f543cea9787 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -282,7 +282,7 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
         pcpu = get_hard_smp_processor_id(lcpu);
 
         /* Fixup atomic count: it exited inside IRQ handler. */
-        paca[lcpu].__current->thread_info->preempt_count        = 0;
+        task_thread_info(paca[lcpu].__current)->preempt_count   = 0;
 
         /* 
          * If the RTAS start-cpu token does not exist then presume the