From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 24 Oct 2012 08:32:50 +0000 (+0200)
Subject: Merge branch 'sched/core'
X-Git-Tag: next-20121025~31^2~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1fae429114619054181f201de869b15a6dba09ef;p=karo-tx-linux.git

Merge branch 'sched/core'

Conflicts:
	kernel/sched/fair.c
---

1fae429114619054181f201de869b15a6dba09ef
diff --cc kernel/sched/fair.c
index ddf72c1f97db,a319d56c7605..50e5793367f8
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@@ -5461,8 -5500,7 +6006,10 @@@ static void task_tick_fair(struct rq *r
  		entity_tick(cfs_rq, se, queued);
  	}
  
+ 	update_rq_runnable_avg(rq, 1);
++
 +	if (sched_feat_numa(NUMA))
 +		task_tick_numa(rq, curr);
  }
  
  /*