x86, ia64, acpi: Clean up x86-ism in drivers/acpi/numa.c

As pointed out by Linus CONFIG_X86 in drivers/acpi/numa.c is
ugly.

Builds and boots on ia64 (both normally and with maxcpus=8 to limit
the number of cpus).

Signed-off-by: Tony Luck <tony.luck@intel.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Len Brown <len.brown@intel.com>
LKML-Reference: <4D2D6B5D.4080208@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

authored by Tony Luck and committed by Ingo Molnar 9378b63c fa36e956

+2 -6
+2 -6
drivers/acpi/numa.c
··· 275 275 int __init acpi_numa_init(void) 276 276 { 277 277 int ret = 0; 278 - int nr_cpu_entries = nr_cpu_ids; 279 278 280 - #ifdef CONFIG_X86 281 279 /* 282 280 * Should not limit number with cpu num that is from NR_CPUS or nr_cpus= 283 281 * SRAT cpu entries could have different order with that in MADT. 284 282 * So go over all cpu entries in SRAT to get apicid to node mapping. 285 283 */ 286 - nr_cpu_entries = MAX_LOCAL_APIC; 287 - #endif 288 284 289 285 /* SRAT: Static Resource Affinity Table */ 290 286 if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) { 291 287 acpi_table_parse_srat(ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY, 292 - acpi_parse_x2apic_affinity, nr_cpu_entries); 288 + acpi_parse_x2apic_affinity, 0); 293 289 acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY, 294 - acpi_parse_processor_affinity, nr_cpu_entries); 290 + acpi_parse_processor_affinity, 0); 295 291 ret = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY, 296 292 acpi_parse_memory_affinity, 297 293 NR_NODE_MEMBLKS);