From b5c5b708476c6ed56e074b43ec6bf61b5db8d5a5 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 12 Jan 2006 01:05:48 -0800 Subject: [PATCH] --- yaml --- r: 18071 b: refs/heads/master c: ca9bc0bb2d1c7afdd34ec79b3de4d16a8e0225e8 h: refs/heads/master i: 18069: 6bc421c86464642088077cfa8b55e0f24c33fd0a 18067: 268eb5810b8d013cac2ece438a9ac2ef8b11c632 18063: 5249f159c93a655f694953721819d9e44eadab86 v: v3 --- [refs] | 2 +- trunk/arch/um/kernel/process_kern.c | 2 +- trunk/arch/um/kernel/tt/process_kern.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 020578b2a800..610e4911df58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36483c6b5e6cc8f29fbe5203caa7e0b836802747 +refs/heads/master: ca9bc0bb2d1c7afdd34ec79b3de4d16a8e0225e8 diff --git a/trunk/arch/um/kernel/process_kern.c b/trunk/arch/um/kernel/process_kern.c index d2d3f256778c..7f13b85d2656 100644 --- a/trunk/arch/um/kernel/process_kern.c +++ b/trunk/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/trunk/arch/um/kernel/tt/process_kern.c b/trunk/arch/um/kernel/tt/process_kern.c index 14d4622a5fb8..1f7dec87b6c1 100644 --- a/trunk/arch/um/kernel/tt/process_kern.c +++ b/trunk/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);