diff options
author | Lee Schermerhorn <lee.schermerhorn@hp.com> | 2010-05-26 17:45:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 12:12:57 -0400 |
commit | fd1197f1131a1f1d8bc192f9cfbbe17e305f17f3 (patch) | |
tree | 9fb28028ef9159f3e4c546e1ae3492828222d233 /arch/ia64 | |
parent | 7aac789885512388a66d47280d7e7777ffba1e59 (diff) |
numa: ia64: support numa_mem_id() for memoryless nodes
Enable 'HAVE_MEMORYLESS_NODES' by default when NUMA configured on ia64.
Initialize percpu 'numa_mem' variable when starting secondary cpus.
Generic initialization will handle the boot cpu.
Nothing uses 'numa_mem_id()' yet. Subsequent patch with modify slab to
use this.
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>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/Kconfig | 4 | ||||
-rw-r--r-- | arch/ia64/kernel/smpboot.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 00ba08708873..95610820041e 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -502,6 +502,10 @@ config USE_PERCPU_NUMA_NODE_ID | |||
502 | def_bool y | 502 | def_bool y |
503 | depends on NUMA | 503 | depends on NUMA |
504 | 504 | ||
505 | config HAVE_MEMORYLESS_NODES | ||
506 | def_bool y | ||
507 | depends on NUMA | ||
508 | |||
505 | config ARCH_PROC_KCORE_TEXT | 509 | config ARCH_PROC_KCORE_TEXT |
506 | def_bool y | 510 | def_bool y |
507 | depends on PROC_KCORE | 511 | depends on PROC_KCORE |
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index 8aae2d9b2680..518e876a410d 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
@@ -394,6 +394,7 @@ smp_callin (void) | |||
394 | * numa_node_id() works after this. | 394 | * numa_node_id() works after this. |
395 | */ | 395 | */ |
396 | set_numa_node(cpu_to_node_map[cpuid]); | 396 | set_numa_node(cpu_to_node_map[cpuid]); |
397 | set_numa_mem(local_memory_node(cpu_to_node_map[cpuid])); | ||
397 | 398 | ||
398 | ipi_call_lock_irq(); | 399 | ipi_call_lock_irq(); |
399 | spin_lock(&vector_lock); | 400 | spin_lock(&vector_lock); |