From 7db3d62c10c25e0bda75c18582ee8c3e6d234d4f Mon Sep 17 00:00:00 2001 From: Mike Galbraith Date: Thu, 11 Mar 2010 17:17:17 +0100 Subject: [PATCH] --- yaml --- r: 191389 b: refs/heads/master c: 6bc6cf2b61336ed0c55a615eb4c0c8ed5daf3f08 h: refs/heads/master i: 191387: f7aa55e0a84571d64a4d8ff52c8d8361ae96aedf v: v3 --- [refs] | 2 +- trunk/kernel/sched_fair.c | 10 ---------- trunk/kernel/sched_features.h | 7 ------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 361b8ca820d3..19b78c6ae59c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b911acdf08477c059d1c36c21113ab1696c612b +refs/heads/master: 6bc6cf2b61336ed0c55a615eb4c0c8ed5daf3f08 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 0008cc4a1199..de98e2e9d6e1 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -741,16 +741,6 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial) if (!initial && sched_feat(FAIR_SLEEPERS)) { unsigned long thresh = sysctl_sched_latency; - /* - * Convert the sleeper threshold into virtual time. - * SCHED_IDLE is a special sub-class. We care about - * fairness only relative to other SCHED_IDLE tasks, - * all of which have the same weight. - */ - if (sched_feat(NORMALIZED_SLEEPER) && (!entity_is_task(se) || - task_of(se)->policy != SCHED_IDLE)) - thresh = calc_delta_fair(thresh, se); - /* * Halve their sleep time's effect, to allow * for a gentler effect of sleepers: diff --git a/trunk/kernel/sched_features.h b/trunk/kernel/sched_features.h index c545e048dfed..404288354aee 100644 --- a/trunk/kernel/sched_features.h +++ b/trunk/kernel/sched_features.h @@ -12,13 +12,6 @@ SCHED_FEAT(FAIR_SLEEPERS, 1) */ SCHED_FEAT(GENTLE_FAIR_SLEEPERS, 1) -/* - * By not normalizing the sleep time, heavy tasks get an effective - * longer period, and lighter task an effective shorter period they - * are considered running. - */ -SCHED_FEAT(NORMALIZED_SLEEPER, 0) - /* * Place new tasks ahead so that they do not starve already running * tasks