From 6a9a261775c10195bb25657fddc38e0446043720 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Fri, 27 Jun 2008 13:41:33 +0200 Subject: [PATCH] --- yaml --- r: 100235 b: refs/heads/master c: 93b75217df39e6d75889cc6f8050343286aff4a5 h: refs/heads/master i: 100233: 3c42b223c83212ba689829394d2a6036acedf525 100231: 4c7e183930f0eeebd6c4f778d01a87c6a890558a v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 4 ++-- trunk/kernel/sched_features.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3ce599a2bb25..bbfb807eb4b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb5ef42a03a13f95a9ea94e6cda4f7a47497871f +refs/heads/master: 93b75217df39e6d75889cc6f8050343286aff4a5 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 10d43f5bf0fc..6c5eb3bc37e0 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -2000,7 +2000,7 @@ static unsigned long source_load(int cpu, int type) struct rq *rq = cpu_rq(cpu); unsigned long total = weighted_cpuload(cpu); - if (type == 0) + if (type == 0 || !sched_feat(LB_BIAS)) return total; return min(rq->cpu_load[type-1], total); @@ -2015,7 +2015,7 @@ static unsigned long target_load(int cpu, int type) struct rq *rq = cpu_rq(cpu); unsigned long total = weighted_cpuload(cpu); - if (type == 0) + if (type == 0 || !sched_feat(LB_BIAS)) return total; return max(rq->cpu_load[type-1], total); diff --git a/trunk/kernel/sched_features.h b/trunk/kernel/sched_features.h index 04123af2e678..d56e3053e746 100644 --- a/trunk/kernel/sched_features.h +++ b/trunk/kernel/sched_features.h @@ -8,3 +8,4 @@ SCHED_FEAT(SYNC_WAKEUPS, 1) SCHED_FEAT(HRTICK, 1) SCHED_FEAT(DOUBLE_TICK, 0) SCHED_FEAT(ASYM_GRAN, 1) +SCHED_FEAT(LB_BIAS, 0) \ No newline at end of file