From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 30 Oct 2012 07:15:40 +0000 (+0100)
Subject: Merge branch 'numa/core'
X-Git-Tag: next-20121031~36^2~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e8ab4021f3167a60efd09af1f722057a3d6e9929;p=karo-tx-linux.git

Merge branch 'numa/core'

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

e8ab4021f3167a60efd09af1f722057a3d6e9929
diff --cc kernel/sched/fair.c
index 59e072b2db97,c0a2e0ad2acb..2cebc814af6d
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@@ -5500,7 -5473,8 +6018,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);
  }
  
  /*