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

Commit bffb276f 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: Use rq->clock_task instead of rq->clock for correctly maintaining load averages
  sched: Fix/remove redundant cfs_rq checks
  sched: Fix sign under-flows in wake_affine
parents f7b548fa 05ca62c6

kernel/sched_fair.c

+5 −8
Original line number Diff line number Diff line
@@ -722,10 +722,10 @@ static void update_cfs_load(struct cfs_rq *cfs_rq, int global_update) 
	u64 now, delta;

	unsigned long load = cfs_rq->load.weight;



	if (!cfs_rq)

	if (cfs_rq->tg == &root_task_group)

		return;



	now = rq_of(cfs_rq)->clock;

	now = rq_of(cfs_rq)->clock_task;

	delta = now - cfs_rq->load_stamp;



	/* truncate load history at 4 idle periods */
@@ -830,9 +830,6 @@ static void update_cfs_shares(struct cfs_rq *cfs_rq, long weight_delta) 
	struct sched_entity *se;

	long shares;



	if (!cfs_rq)

		return;



	tg = cfs_rq->tg;

	se = tg->se[cpu_of(rq_of(cfs_rq))];

	if (!se)
@@ -1432,7 +1429,7 @@ static inline unsigned long effective_load(struct task_group *tg, int cpu, 


static int wake_affine(struct sched_domain *sd, struct task_struct *p, int sync)

{

	unsigned long this_load, load;

	s64 this_load, load;

	int idx, this_cpu, prev_cpu;

	unsigned long tl_per_task;

	struct task_group *tg;
@@ -1471,8 +1468,8 @@ static int wake_affine(struct sched_domain *sd, struct task_struct *p, int sync) 
	 * Otherwise check if either cpus are near enough in load to allow this

	 * task to be woken on this_cpu.

	 */

	if (this_load) {

		unsigned long this_eff_load, prev_eff_load;

	if (this_load > 0) {

		s64 this_eff_load, prev_eff_load;



		this_eff_load = 100;

		this_eff_load *= power_of(prev_cpu);