Commit 3dd6b5fb436083fdd8af7ad2baa07db19deb73b2

Authored by Lee Schermerhorn
Committed by Linus Torvalds
1 parent 7d6e6d09de

numa: in-kernel profiling: use cpu_to_mem() for per cpu allocations

In kernel profiling requires that we be able to allocate "local" memory
for each cpu.  Use "cpu_to_mem()" instead of "cpu_to_node()" to support
memoryless nodes.

Depends on the "numa_mem_id()" patch.

Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: Nick Piggin <npiggin@suse.de>
Cc: David Rientjes <rientjes@google.com>
Cc: Eric Whitney <eric.whitney@hp.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -365,7 +365,7 @@
365 365 switch (action) {
366 366 case CPU_UP_PREPARE:
367 367 case CPU_UP_PREPARE_FROZEN:
368   - node = cpu_to_node(cpu);
  368 + node = cpu_to_mem(cpu);
369 369 per_cpu(cpu_profile_flip, cpu) = 0;
370 370 if (!per_cpu(cpu_profile_hits, cpu)[1]) {
371 371 page = alloc_pages_exact_node(node,
... ... @@ -567,7 +567,7 @@
567 567 int cpu;
568 568  
569 569 for_each_online_cpu(cpu) {
570   - int node = cpu_to_node(cpu);
  570 + int node = cpu_to_mem(cpu);
571 571 struct page *page;
572 572  
573 573 page = alloc_pages_exact_node(node,