Merge branch 'l7200' into devel

[sfrench/cifs-2.6.git] / drivers / cpuidle / governors / menu.c

diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index 52ff8aa63f8449b04d5bcd046b028e23dcf6d68b..1b128702d300bc5a07ba7ec09f03ec83f3b11b43 100644 (file)
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -143,7 +143,7 @@ static inline int which_bucket(unsigned int duration)
         * This allows us to calculate
         * E(duration)|iowait
         */
-       if (nr_iowait_cpu())
+       if (nr_iowait_cpu(smp_processor_id()))
                bucket = BUCKETS/2;
 
        if (duration < 10)
@@ -175,7 +175,7 @@ static inline int performance_multiplier(void)
        mult += 2 * get_loadavg();
 
        /* for IO wait tasks (per cpu!) we add 5x each */
-       mult += 10 * nr_iowait_cpu();
+       mult += 10 * nr_iowait_cpu(smp_processor_id());
 
        return mult;
 }