Merge commit 'v2.6.35-rc4' into perf/core

[net-next-2.6.git] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index 8c473adbf2230b78cad7b87dd4b3b453a1d4ec21..265cf3a2b5d898e89d714535c04af312831d79c8 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2873,9 +2873,9 @@ unsigned long nr_iowait(void)
        return sum;
 }
 
-unsigned long nr_iowait_cpu(void)
+unsigned long nr_iowait_cpu(int cpu)
 {
-       struct rq *this = this_rq();
+       struct rq *this = cpu_rq(cpu);
        return atomic_read(&this->nr_iowait);
 }