From: Al Viro Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- arch/um/kernel/process_kern.c | 2 +- arch/um/kernel/tt/process_kern.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff -puN arch/um/kernel/process_kern.c~uml-task_thread_info arch/um/kernel/process_kern.c --- devel/arch/um/kernel/process_kern.c~uml-task_thread_info 2006-01-04 22:02:13.000000000 -0800 +++ devel-akpm/arch/um/kernel/process_kern.c 2006-01-04 22:02:13.000000000 -0800 @@ -108,7 +108,7 @@ void set_current(void *t) { struct task_struct *task = t; - cpu_tasks[task->thread_info->cpu] = ((struct cpu_task) + cpu_tasks[task_thread_info(task)->cpu] = ((struct cpu_task) { external_pid(task), task }); } diff -puN arch/um/kernel/tt/process_kern.c~uml-task_thread_info arch/um/kernel/tt/process_kern.c --- devel/arch/um/kernel/tt/process_kern.c~uml-task_thread_info 2006-01-04 22:02:13.000000000 -0800 +++ devel-akpm/arch/um/kernel/tt/process_kern.c 2006-01-04 22:02:13.000000000 -0800 @@ -37,7 +37,7 @@ void switch_to_tt(void *prev, void *next from = prev; to = next; - cpu = from->thread_info->cpu; + cpu = task_thread_info(from)->cpu; if(cpu == 0) forward_interrupts(to->thread.mode.tt.extern_pid); #ifdef CONFIG_SMP @@ -344,7 +344,7 @@ int do_proc_op(void *t, int proc_id) pid = thread->request.u.exec.pid; do_exec(thread->mode.tt.extern_pid, pid); thread->mode.tt.extern_pid = pid; - cpu_tasks[task->thread_info->cpu].pid = pid; + cpu_tasks[task_thread_info(task)->cpu].pid = pid; break; case OP_FORK: attach_process(thread->request.u.fork.pid); _