diff options
author | Tony Luck <tony.luck@intel.com> | 2010-05-27 18:35:13 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2010-05-27 18:35:13 -0400 |
commit | 4ec37de89d8c758ee8115e0e64b3f994910789ee (patch) | |
tree | 3c45c8f93054699a5245031919da7776b243ebf1 /arch/ia64/kernel | |
parent | cc106eb35ed4abea675bce0d8fe40a46ff0b4a72 (diff) |
[IA64] Fix build breakage
In commit 0ac0c0d0f837c499afd02a802f9cf52d3027fa3b
cpusets: randomize node rotor used in cpuset_mem_spread_node()
Jack Steiner fixed a problem with too many small tasks being
assigned to node 0. Copy his code to ia64 to avoid build error.
arch/ia64/kernel/smpboot.c:641: error: ‘cpu_to_node_map’ undeclared (first use in this function)
In commit 3bccd996276b108c138e8176793a26ecef54d573
numa: ia64: use generic percpu var numa_node_id() implementation
Lee Schermerhorn added some set_numa_node() calls - but these
only work on CONFIG_NUMA=y configurations. Surround the calls
with #ifdef CONFIG_NUMA
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel')
-rw-r--r-- | arch/ia64/kernel/smpboot.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index 518e876a410d..6a1380e90f87 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
@@ -390,11 +390,13 @@ smp_callin (void) | |||
390 | 390 | ||
391 | fix_b0_for_bsp(); | 391 | fix_b0_for_bsp(); |
392 | 392 | ||
393 | #ifdef CONFIG_NUMA | ||
393 | /* | 394 | /* |
394 | * numa_node_id() works after this. | 395 | * numa_node_id() works after this. |
395 | */ | 396 | */ |
396 | set_numa_node(cpu_to_node_map[cpuid]); | 397 | set_numa_node(cpu_to_node_map[cpuid]); |
397 | set_numa_mem(local_memory_node(cpu_to_node_map[cpuid])); | 398 | set_numa_mem(local_memory_node(cpu_to_node_map[cpuid])); |
399 | #endif | ||
398 | 400 | ||
399 | ipi_call_lock_irq(); | 401 | ipi_call_lock_irq(); |
400 | spin_lock(&vector_lock); | 402 | spin_lock(&vector_lock); |
@@ -638,7 +640,9 @@ void __devinit smp_prepare_boot_cpu(void) | |||
638 | { | 640 | { |
639 | cpu_set(smp_processor_id(), cpu_online_map); | 641 | cpu_set(smp_processor_id(), cpu_online_map); |
640 | cpu_set(smp_processor_id(), cpu_callin_map); | 642 | cpu_set(smp_processor_id(), cpu_callin_map); |
643 | #ifdef CONFIG_NUMA | ||
641 | set_numa_node(cpu_to_node_map[smp_processor_id()]); | 644 | set_numa_node(cpu_to_node_map[smp_processor_id()]); |
645 | #endif | ||
642 | per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE; | 646 | per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE; |
643 | paravirt_post_smp_prepare_boot_cpu(); | 647 | paravirt_post_smp_prepare_boot_cpu(); |
644 | } | 648 | } |