Commit 78314ba8 authored by David Mosberger's avatar David Mosberger

ia64: Fix formatting a bit and issue #error when attempting to

    	use CONFIG_NUMA without CONFIG_ACPI_NUMA.
parent 12c79244
...@@ -429,30 +429,35 @@ smp_build_cpu_map (void) ...@@ -429,30 +429,35 @@ smp_build_cpu_map (void)
} }
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
char cpu_to_node_map[NR_CPUS] __cacheline_aligned; char cpu_to_node_map[NR_CPUS] __cacheline_aligned;
/* /*
* Build cpu to node mapping. * Build cpu to node mapping.
*/ */
void __init void __init
build_cpu_to_node_map(void) build_cpu_to_node_map (void)
{ {
int cpu, i; int cpu, i;
for(cpu=0; cpu<NR_CPUS; cpu++) { for(cpu = 0; cpu < NR_CPUS; ++cpu) {
/* /*
* All Itanium NUMA platforms I know use ACPI, so maybe we * All Itanium NUMA platforms I know use ACPI, so maybe we
* can drop this ifdef completely. [EF] * can drop this ifdef completely. [EF]
*/ */
#ifdef CONFIG_ACPI_NUMA #ifdef CONFIG_ACPI_NUMA
for(i=0; i<NR_CPUS; i++) for (i = 0; i < NR_CPUS; ++i)
if (cpu_physical_id(cpu) == node_cpuid[i].phys_id) { if (cpu_physical_id(cpu) == node_cpuid[i].phys_id) {
cpu_to_node_map[cpu]=node_cpuid[i].nid; cpu_to_node_map[cpu] = node_cpuid[i].nid;
break; break;
} }
#else
# error Fixme: Dunno how to build CPU-to-node map.
#endif #endif
} }
} }
#endif
#endif /* CONFIG_NUMA */
/* /*
* Cycle through the APs sending Wakeup IPIs to boot each. * Cycle through the APs sending Wakeup IPIs to boot each.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment