[IA64] Fix build breakage
In commit0ac0c0d0f8
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 commit3bccd99627
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>
This commit is contained in:
@@ -390,11 +390,13 @@ smp_callin (void)
|
||||
|
||||
fix_b0_for_bsp();
|
||||
|
||||
#ifdef CONFIG_NUMA
|
||||
/*
|
||||
* numa_node_id() works after this.
|
||||
*/
|
||||
set_numa_node(cpu_to_node_map[cpuid]);
|
||||
set_numa_mem(local_memory_node(cpu_to_node_map[cpuid]));
|
||||
#endif
|
||||
|
||||
ipi_call_lock_irq();
|
||||
spin_lock(&vector_lock);
|
||||
@@ -638,7 +640,9 @@ void __devinit smp_prepare_boot_cpu(void)
|
||||
{
|
||||
cpu_set(smp_processor_id(), cpu_online_map);
|
||||
cpu_set(smp_processor_id(), cpu_callin_map);
|
||||
#ifdef CONFIG_NUMA
|
||||
set_numa_node(cpu_to_node_map[smp_processor_id()]);
|
||||
#endif
|
||||
per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE;
|
||||
paravirt_post_smp_prepare_boot_cpu();
|
||||
}
|
||||
|
Reference in New Issue
Block a user