From b4dcc434deede3ec908df3b2f2310b15298c4df9 Mon Sep 17 00:00:00 2001
From: Jack Steiner <steiner@sgi.com>
Date: Tue, 23 Sep 2008 15:37:13 -0500
Subject: [PATCH] --- yaml --- r: 113537 b: refs/heads/master c:
 2e42060c19cb79adacc48beb5e9ec5361df976a2 h: refs/heads/master i:   113535:
 dcfe9fd81e15347830438ebe6ef0ea521f2d66d9 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/x86/kernel/setup.c | 2 ++
 trunk/arch/x86/mm/srat_64.c   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b19392675982..69b0b0ef0a23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e04d645f326bc8e591bc4ae21c4ab535987a17c1
+refs/heads/master: 2e42060c19cb79adacc48beb5e9ec5361df976a2
diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
index de6a9d6d599f..2255782e8d4b 100644
--- a/trunk/arch/x86/kernel/setup.c
+++ b/trunk/arch/x86/kernel/setup.c
@@ -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.
diff --git a/trunk/arch/x86/mm/srat_64.c b/trunk/arch/x86/mm/srat_64.c
index 1b4763e26ea9..51c0a2fc14fe 100644
--- a/trunk/arch/x86/mm/srat_64.c
+++ b/trunk/arch/x86/mm/srat_64.c
@@ -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;