Commit a985aabe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel:
  revert "sched: fix fair sleepers"
parents 1018cf9b e2df9e09

kernel/sched_fair.c

+2 −4
Original line number Diff line number Diff line
@@ -510,10 +510,8 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial) 


	if (!initial) {

		/* sleeps upto a single latency don't count. */

		if (sched_feat(NEW_FAIR_SLEEPERS)) {

			vruntime -= calc_delta_fair(sysctl_sched_latency,

						    &cfs_rq->load);

		}

		if (sched_feat(NEW_FAIR_SLEEPERS))

			vruntime -= sysctl_sched_latency;



		/* ensure we never gain time by being placed backwards. */

		vruntime = max_vruntime(se->vruntime, vruntime);