Merge to Fedora Core 2 kernel-2.6.8-1.521

[linux-2.6.git] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index 5771500..b4512b7 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1202,7 +1202,7 @@ unsigned long nr_uninterruptible(void)
 {
        unsigned long i, sum = 0;
 
-       for_each_online_cpu(i)
+       for_each_cpu(i)
                sum += cpu_rq(i)->nr_uninterruptible;
 
        return sum;
@@ -1212,7 +1212,7 @@ unsigned long long nr_context_switches(void)
 {
        unsigned long long i, sum = 0;
 
-       for_each_online_cpu(i)
+       for_each_cpu(i)
                sum += cpu_rq(i)->nr_switches;
 
        return sum;
@@ -1222,7 +1222,7 @@ unsigned long nr_iowait(void)
 {
        unsigned long i, sum = 0;
 
-       for_each_online_cpu(i)
+       for_each_cpu(i)
                sum += atomic_read(&cpu_rq(i)->nr_iowait);
 
        return sum;
@@ -4361,6 +4361,7 @@ void __init sched_init(void)
        sched_domain_init.groups = &sched_group_init;
        sched_domain_init.last_balance = jiffies;
        sched_domain_init.balance_interval = INT_MAX; /* Don't balance */
+       sched_domain_init.busy_factor = 1;
 
        memset(&sched_group_init, 0, sizeof(struct sched_group));
        sched_group_init.cpumask = CPU_MASK_ALL;