---

yaml
---
r: 18095
b: refs/heads/master
c: 718d611
h: refs/heads/master
i:
  18093: 720f7bc
  18091: 5d1812d
  18087: 9426bf8
  18079: e01e332
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfa0f29b6da2c4d45ecdeaabe17af4c4adc47c05
+refs/heads/master: 718d6114fcd894bf4d3527b9e206a1cbcaaae35d

trunk/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. */

trunk/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 */

trunk/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
         {