3 files changed, 5 insertions, 5 deletions

diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c
index e88b13b139d5..843513102d3c 100644
--- a/arch/cris/arch-v32/kernel/process.c
+++ b/arch/cris/arch-v32/kernel/process.c
@@ -157,7 +157,7 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
          * The TLS is in $mof beacuse it is the 5th argument to sys_clone.
          */
         if (p->mm && (clone_flags & CLONE_SETTLS)) {
-                p->thread_info->tls = regs->mof;
+                task_thread_info(p)->tls = regs->mof;
         }
 
         /* Put the switch stack right below the pt_regs. */
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c
index 13867f4fad16..da40d19a151e 100644
--- a/arch/cris/arch-v32/kernel/smp.c
+++ b/arch/cris/arch-v32/kernel/smp.c
@@ -113,10 +113,10 @@ smp_boot_one_cpu(int cpuid)
         if (IS_ERR(idle))
                 panic("SMP: fork failed for CPU:%d", cpuid);
 
-        idle->thread_info->cpu = cpuid;
+        task_thread_info(idle)->cpu = cpuid;
 
         /* Information to the CPU that is about to boot */
-        smp_init_current_idle_thread = idle->thread_info;
+        smp_init_current_idle_thread = task_thread_info(idle);
         cpu_now_booting = cpuid;
 
         /* Wait for CPU to come online */
diff --git a/arch/cris/arch-v32/mm/tlb.c b/arch/cris/arch-v32/mm/tlb.c
index b08a28bb58ab..9d75d7692303 100644
--- a/arch/cris/arch-v32/mm/tlb.c
+++ b/arch/cris/arch-v32/mm/tlb.c
@@ -198,9 +198,9 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next,
         per_cpu(current_pgd, cpu) = next->pgd;
 
         /* Switch context in the MMU. */
-        if (tsk && tsk->thread_info)
+        if (tsk && task_thread_info(tsk))
         {
-          SPEC_REG_WR(SPEC_REG_PID, next->context.page_id | tsk->thread_info->tls);
+          SPEC_REG_WR(SPEC_REG_PID, next->context.page_id | task_thread_info(tsk)->tls);
         }
         else
         {