diff --git a/[refs] b/[refs] index a5f7e203525a..12a6d94912a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b968905292eaa52b25abb7b3e6c0841dac9f03ae +refs/heads/master: b0aa51b999c449e5e3f9faa1ee406e052d407fe7 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 18fd17172eb6..67084936b602 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -747,7 +747,7 @@ pick_next(struct cfs_rq *cfs_rq, struct sched_entity *se) struct rq *rq = rq_of(cfs_rq); u64 pair_slice = rq->clock - cfs_rq->pair_start; - if (!cfs_rq->next || pair_slice > sched_slice(cfs_rq, cfs_rq->next)) { + if (!cfs_rq->next || pair_slice > sysctl_sched_min_granularity) { cfs_rq->pair_start = rq->clock; return se; }