Commit 2e42060c authored Sep 23, 2008 by Jack Steiner Committed by Ingo Molnar Oct 13, 2008

x86, uv: add early detection of UV system types



Portions of the ACPI code needs to know if a system is a UV system prior
to genapic initialization. This patch adds a call early_acpi_boot_init()
so that the apic type is discovered earlier.

V2 of the patch adding fixes from Yinghai Lu.
Much cleaner and smaller.

Signed-off-by: Jack Steiner <steiner@sgi.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent e04d645f

arch/x86/kernel/setup.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -998,6 +998,8 @@ void __init setup_arch(char **cmdline_p)
		*/
		acpi_boot_table_init();

		early_acpi_boot_init();

		#ifdef CONFIG_ACPI_NUMA
		/*
		* Parse SRAT to discover nodes.

arch/x86/mm/srat_64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -138,7 +138,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
		return;
		}

		if (is_uv_system())
		if (get_uv_system_type() >= UV_X2APIC)
		apic_id = (pa->apic_id << 8) \| pa->local_sapic_eid;
		else
		apic_id = pa->apic_id;