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

Commit 1b065fdf 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: Fix idle balancing
  sched: Fix volanomark performance regression
parents b76a1e4f d5ad140b

kernel/sched_fair.c

+3 −5
Original line number Diff line number Diff line
@@ -1758,10 +1758,6 @@ static void pull_task(struct rq *src_rq, struct task_struct *p, 
	set_task_cpu(p, this_cpu);

	activate_task(this_rq, p, 0);

	check_preempt_curr(this_rq, p, 0);



	/* re-arm NEWIDLE balancing when moving tasks */

	src_rq->avg_idle = this_rq->avg_idle = 2*sysctl_sched_migration_cost;

	this_rq->idle_stamp = 0;

}



/*
@@ -3219,9 +3215,11 @@ static void idle_balance(int this_cpu, struct rq *this_rq) 
		interval = msecs_to_jiffies(sd->balance_interval);

		if (time_after(next_balance, sd->last_balance + interval))

			next_balance = sd->last_balance + interval;

		if (pulled_task)

		if (pulled_task) {

			this_rq->idle_stamp = 0;

			break;

		}

	}



	raw_spin_lock(&this_rq->lock);