From 77db19f23352352ccb161dc9bf1fb0cbff2d746e Mon Sep 17 00:00:00 2001 From: Sisir Koppaka Date: Sat, 26 Mar 2011 18:22:55 +0530 Subject: [PATCH] --- yaml --- r: 243652 b: refs/heads/master c: 3436ae1298cb22d722a6520fc97f112dd767a9e1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched_fair.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1a3a32799ae8..301587162ac3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2495b577324938f0209b4f895c5f205c7e47854 +refs/heads/master: 3436ae1298cb22d722a6520fc97f112dd767a9e1 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 3f7ec9e27ee1..c7ec5c8e7b44 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -22,6 +22,7 @@ #include #include +#include /* * Targeted preemption latency for CPU-bound tasks: @@ -3850,8 +3851,8 @@ static void rebalance_domains(int cpu, enum cpu_idle_type idle) interval = msecs_to_jiffies(interval); if (unlikely(!interval)) interval = 1; - if (interval > HZ*NR_CPUS/10) - interval = HZ*NR_CPUS/10; + if (interval > HZ*num_online_cpus()/10) + interval = HZ*num_online_cpus()/10; need_serialize = sd->flags & SD_SERIALIZE;