[PATCH] fix two unwrapped uses of thread_info->cpu

This patch for 2.5.28 fixes two explicit accesses to thread_info->cpu
in generic code to use the new UP-optimised macros instead.

diff --git a/fs/proc/array.c b/fs/proc/array.c
index 8001f3faed1bf1b6f5100ec419009d16b29fc701..0084e27fe7a85a657563fcdce30ccf04c8b65916 100644 (file)
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -386,7 +386,7 @@ int proc_pid_stat(struct task_struct *task, char * buffer)
                task->nswap,
                task->cnswap,
                task->exit_signal,
-               task->thread_info->cpu,
+               task_cpu(task),
                task->rt_priority,
                task->policy);
        if(mm)

diff --git a/kernel/sched.c b/kernel/sched.c
index 47584a3badeb674a8da95e3c1aba3e1143bbe0e8..a54ee5a0356c6f9ee5e6c4ccedd360c4ffcf342f 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -357,7 +357,7 @@ repeat:
  */
 void kick_if_running(task_t * p)
 {
-       if ((task_running(task_rq(p), p)) && (p->thread_info->cpu != smp_processor_id()))
+       if ((task_running(task_rq(p), p)) && (task_cpu(p) != smp_processor_id()))
                resched_task(p);
 }