From: Al Viro Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- arch/cris/arch-v32/kernel/process.c | 2 +- arch/cris/arch-v32/kernel/smp.c | 4 ++-- arch/cris/arch-v32/mm/tlb.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff -puN arch/cris/arch-v32/kernel/process.c~cris-task_thread_info arch/cris/arch-v32/kernel/process.c --- devel/arch/cris/arch-v32/kernel/process.c~cris-task_thread_info 2006-01-04 22:03:02.000000000 -0800 +++ devel-akpm/arch/cris/arch-v32/kernel/process.c 2006-01-04 22:03:02.000000000 -0800 @@ -157,7 +157,7 @@ copy_thread(int nr, unsigned long clone_ * 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 -puN arch/cris/arch-v32/kernel/smp.c~cris-task_thread_info arch/cris/arch-v32/kernel/smp.c --- devel/arch/cris/arch-v32/kernel/smp.c~cris-task_thread_info 2006-01-04 22:03:02.000000000 -0800 +++ devel-akpm/arch/cris/arch-v32/kernel/smp.c 2006-01-04 22:03:02.000000000 -0800 @@ -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 -puN arch/cris/arch-v32/mm/tlb.c~cris-task_thread_info arch/cris/arch-v32/mm/tlb.c --- devel/arch/cris/arch-v32/mm/tlb.c~cris-task_thread_info 2006-01-04 22:03:02.000000000 -0800 +++ devel-akpm/arch/cris/arch-v32/mm/tlb.c 2006-01-04 22:03:02.000000000 -0800 @@ -198,9 +198,9 @@ switch_mm(struct mm_struct *prev, struct 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 { _