x86, ia64, acpi: Clean up x86-ism in drivers/acpi/numa.c (9378b63c) · Commits · 戴 / test

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>

drivers/acpi/numa.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -275,23 +275,19 @@ acpi_table_parse_srat(enum acpi_srat_type id,
		int __init acpi_numa_init(void)
		{
		int ret = 0;
		int nr_cpu_entries = nr_cpu_ids;

		#ifdef CONFIG_X86
		/*
		* Should not limit number with cpu num that is from NR_CPUS or nr_cpus=
		* SRAT cpu entries could have different order with that in MADT.
		* So go over all cpu entries in SRAT to get apicid to node mapping.
		*/
		nr_cpu_entries = MAX_LOCAL_APIC;
		#endif

		/* SRAT: Static Resource Affinity Table */
		if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) {
		acpi_table_parse_srat(ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY,
		acpi_parse_x2apic_affinity, nr_cpu_entries);
		acpi_parse_x2apic_affinity, 0);
		acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY,
		acpi_parse_processor_affinity, nr_cpu_entries);
		acpi_parse_processor_affinity, 0);
		ret = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
		acpi_parse_memory_affinity,
		NR_NODE_MEMBLKS);

Admin message