Merge branch 'numa/core'

Conflicts:
	kernel/sched/fair.c

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/debug.c
Simple merge

diff --cc kernel/sched/fair.c
index 59e072b2db970b80eb2eac7b435d297305640e2a,c0a2e0ad2acb57020e614e49bb9dff057d8c72be..2cebc814af6db244fbc211ecae1517303561f7f9
--- 1/kernel/sched/fair.c
--- 2/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);
  }
  
  /*

diff --cc kernel/sched/features.h
Simple merge

diff --cc kernel/sched/sched.h
Simple merge

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/memory.c
Simple merge