From: Rik van Riel <r...@redhat.com> commit 58b46da336a9312b2e21bb576d1c2c484dbf6257 upstream
We track both the node of the memory after a NUMA fault, and the node of the CPU on which the fault happened. Rename the local variables in task_numa_fault to make things more explicit. Suggested-by: Mel Gorman <mgor...@suse.de> Signed-off-by: Rik van Riel <r...@redhat.com> Acked-by: Mel Gorman <mgor...@suse.de> Signed-off-by: Peter Zijlstra <pet...@infradead.org> Cc: Chegu Vinod <chegu_vi...@hp.com> Link: http://lkml.kernel.org/r/1390860228-21539-9-git-send-email-r...@redhat.com Signed-off-by: Ingo Molnar <mi...@kernel.org> Signed-off-by: Yang Shi <yang....@windriver.com> --- kernel/sched/fair.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index f88b7e0..f710c0b 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -1739,11 +1739,11 @@ void task_numa_free(struct task_struct *p) /* * Got a PROT_NONE fault for a page on @node. */ -void task_numa_fault(int last_cpupid, int node, int pages, int flags) +void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags) { struct task_struct *p = current; bool migrated = flags & TNF_MIGRATED; - int this_node = task_node(current); + int cpu_node = task_node(current); int priv; if (!numabalancing_enabled) @@ -1798,8 +1798,8 @@ void task_numa_fault(int last_cpupid, int node, int pages, int flags) if (migrated) p->numa_pages_migrated += pages; - p->numa_faults_buffer_memory[task_faults_idx(node, priv)] += pages; - p->numa_faults_buffer_cpu[task_faults_idx(this_node, priv)] += pages; + p->numa_faults_buffer_memory[task_faults_idx(mem_node, priv)] += pages; + p->numa_faults_buffer_cpu[task_faults_idx(cpu_node, priv)] += pages; p->numa_faults_locality[!!(flags & TNF_FAULT_LOCAL)] += pages; } -- 2.0.2 -- _______________________________________________ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto