From: Al Viro Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- arch/sh/kernel/process.c | 2 +- arch/sh/kernel/smp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN arch/sh/kernel/process.c~sh-task_thread_info arch/sh/kernel/process.c --- devel/arch/sh/kernel/process.c~sh-task_thread_info 2006-01-04 22:02:04.000000000 -0800 +++ devel-akpm/arch/sh/kernel/process.c 2006-01-04 22:02:04.000000000 -0800 @@ -362,7 +362,7 @@ struct task_struct *__switch_to(struct t */ asm volatile("ldc %0, r7_bank" : /* no output */ - : "r" (next->thread_info)); + : "r" (task_thread_info(next))); #ifdef CONFIG_MMU /* If no tasks are using the UBC, we're done */ diff -puN arch/sh/kernel/smp.c~sh-task_thread_info arch/sh/kernel/smp.c --- devel/arch/sh/kernel/smp.c~sh-task_thread_info 2006-01-04 22:02:04.000000000 -0800 +++ devel-akpm/arch/sh/kernel/smp.c 2006-01-04 22:02:04.000000000 -0800 @@ -103,7 +103,7 @@ int __cpu_up(unsigned int cpu) if (IS_ERR(tsk)) panic("Failed forking idle task for cpu %d\n", cpu); - tsk->thread_info->cpu = cpu; + task_thread_info(tsk)->cpu = cpu; cpu_set(cpu, cpu_online_map); _