Re: [PATCH] - V2 Add early detection of UV system types

[Jack Steiner <steiner@sgi.com>]

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.

Signed-off-by: Jack Steiner <steiner@sgi.com>

---

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


 arch/x86/kernel/setup.c |    2 ++
 arch/x86/mm/srat_64.c   |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

Index: linux/arch/x86/kernel/setup.c
===================================================================
--- linux.orig/arch/x86/kernel/setup.c	2008-09-23 15:15:16.000000000 -0500
+++ linux/arch/x86/kernel/setup.c	2008-09-23 15:17:16.000000000 -0500
@@ -960,6 +960,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.
Index: linux/arch/x86/mm/srat_64.c
===================================================================
--- linux.orig/arch/x86/mm/srat_64.c	2008-09-23 15:12:20.000000000 -0500
+++ linux/arch/x86/mm/srat_64.c	2008-09-23 15:22:44.000000000 -0500
@@ -138,7 +138,7 @@ acpi_numa_processor_affinity_init(struct
 		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;