Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c6f1f0f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-fixes-for-linus' of... 

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

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: revert recent sync wakeup changes
parents 94dba895 fc631c82

kernel/sched.c

+0 −10
Original line number Diff line number Diff line
@@ -2266,16 +2266,6 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state, int sync) 
	if (!sched_feat(SYNC_WAKEUPS))

		sync = 0;



	if (!sync) {

		if (current->se.avg_overlap < sysctl_sched_migration_cost &&

			  p->se.avg_overlap < sysctl_sched_migration_cost)

			sync = 1;

	} else {

		if (current->se.avg_overlap >= sysctl_sched_migration_cost ||

			  p->se.avg_overlap >= sysctl_sched_migration_cost)

			sync = 0;

	}



#ifdef CONFIG_SMP

	if (sched_feat(LB_WAKEUP_UPDATE)) {

		struct sched_domain *sd;

kernel/sched_fair.c

+9 −2
Original line number Diff line number Diff line
@@ -1191,15 +1191,20 @@ wake_affine(struct sched_domain *this_sd, struct rq *this_rq, 
	    int idx, unsigned long load, unsigned long this_load,

	    unsigned int imbalance)

{

	struct task_struct *curr = this_rq->curr;

	struct task_group *tg;

	unsigned long tl = this_load;

	unsigned long tl_per_task;

	struct task_group *tg;

	unsigned long weight;

	int balanced;



	if (!(this_sd->flags & SD_WAKE_AFFINE) || !sched_feat(AFFINE_WAKEUPS))

		return 0;



	if (sync && (curr->se.avg_overlap > sysctl_sched_migration_cost ||

			p->se.avg_overlap > sysctl_sched_migration_cost))

		sync = 0;



	/*

	 * If sync wakeup then subtract the (maximum possible)

	 * effect of the currently running task from the load
@@ -1426,7 +1431,9 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int sync) 
	if (!sched_feat(WAKEUP_PREEMPT))

		return;



	if (sched_feat(WAKEUP_OVERLAP) && sync) {

	if (sched_feat(WAKEUP_OVERLAP) && (sync ||

			(se->avg_overlap < sysctl_sched_migration_cost &&

			 pse->avg_overlap < sysctl_sched_migration_cost))) {

		resched_task(curr);

		return;

	}