Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~shefty/rdma-dev.git] / kernel / cpu.c

diff --git a/kernel/cpu.c b/kernel/cpu.c
index c91e30d1ef058134c39932daf37d4cda7658e748..b5e4ab2d427e874404347c7e20186ed4cfd2f488 100644 (file)
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -224,11 +224,13 @@ void clear_tasks_mm_cpumask(int cpu)
 static inline void check_for_tasks(int cpu)
 {
        struct task_struct *p;
 static inline void check_for_tasks(int cpu)
 {
        struct task_struct *p;

+       cputime_t utime, stime;

 
        write_lock_irq(&tasklist_lock);
        for_each_process(p) {
 
        write_lock_irq(&tasklist_lock);
        for_each_process(p) {

+               task_cputime(p, &utime, &stime);

                if (task_cpu(p) == cpu && p->state == TASK_RUNNING &&
                if (task_cpu(p) == cpu && p->state == TASK_RUNNING &&

-                   (p->utime || p->stime))
+                   (utime || stime))

                        printk(KERN_WARNING "Task %s (pid = %d) is on cpu %d "
                                "(state = %ld, flags = %x)\n",
                                p->comm, task_pid_nr(p), cpu,
                        printk(KERN_WARNING "Task %s (pid = %d) is on cpu %d "
                                "(state = %ld, flags = %x)\n",
                                p->comm, task_pid_nr(p), cpu,