2 files changed, 3 insertions, 3 deletions

diff --git a/arch/um/kernel/process_kern.c b/arch/um/kernel/process_kern.c
index d2d3f256778c..7f13b85d2656 100644
--- a/arch/um/kernel/process_kern.c
+++ b/arch/um/kernel/process_kern.c
@@ -107,7 +107,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 --git a/arch/um/kernel/tt/process_kern.c b/arch/um/kernel/tt/process_kern.c
index 14d4622a5fb8..1f7dec87b6c1 100644
--- a/arch/um/kernel/tt/process_kern.c
+++ b/arch/um/kernel/tt/process_kern.c
@@ -36,7 +36,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
@@ -343,7 +343,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);