From 5141f85def3e0dbd4f907882a5d9db7c5432607c Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Mon, 15 Oct 2007 17:00:14 +0200 Subject: [PATCH] --- yaml --- r: 69109 b: refs/heads/master c: 8ca0e14ffb12c257de591571a9e96102acdb1c64 h: refs/heads/master i: 69107: 6c2573cd1697f3716896ec8a0d2fc7b4c25dba6d v: v3 --- [refs] | 2 +- trunk/kernel/sched_fair.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cf904e313b02..55517921c835 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 810e95ccd58d91369191aa4ecc9e6d4a10d8d0c8 +refs/heads/master: 8ca0e14ffb12c257de591571a9e96102acdb1c64 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 3ecbfd0902d8..410b77aea216 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -485,7 +485,9 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial) vruntime += sched_vslice_add(cfs_rq, se); if (!initial) { - if (sched_feat(NEW_FAIR_SLEEPERS)) + struct task_struct *p = container_of(se, struct task_struct, se); + + if (sched_feat(NEW_FAIR_SLEEPERS) && p->policy != SCHED_BATCH) vruntime -= sysctl_sched_latency; vruntime = max_t(s64, vruntime, se->vruntime);