From 6fd8213c71451db2daac80146fa4b34f4b48f0ed Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Thu, 21 Aug 2008 20:49:05 +0200
Subject: [PATCH] --- yaml --- r: 109047 b: refs/heads/master c:
 c4bd1fdab0deec0f69aeabab22075cb22ac8ad44 h: refs/heads/master i:   109045:
 b51e3bea8f135ccbdd934f1cea988dff4a242031   109043:
 8413bb6f120e353a80373716ce16288a05e7e373   109039:
 b90c4a88cb606983eb3afe98315211225845b05d v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/kernel/genx2apic_uv_x.c | 8 +++++---
 trunk/arch/x86/kernel/smpboot.c        | 3 +++
 trunk/include/asm-x86/genapic_32.h     | 1 +
 trunk/include/asm-x86/genapic_64.h     | 1 +
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d6dceb3e6ef4..c0d88567810f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a6ddd5f18405ca92e004416af8ed44b9c9783d7
+refs/heads/master: c4bd1fdab0deec0f69aeabab22075cb22ac8ad44
diff --git a/trunk/arch/x86/kernel/genx2apic_uv_x.c b/trunk/arch/x86/kernel/genx2apic_uv_x.c
index 2d7e307c7779..bfa837cb16be 100644
--- a/trunk/arch/x86/kernel/genx2apic_uv_x.c
+++ b/trunk/arch/x86/kernel/genx2apic_uv_x.c
@@ -293,7 +293,9 @@ static __init void uv_rtc_init(void)
 		sn_rtc_cycles_per_second = ticks_per_sec;
 }
 
-static __init void uv_system_init(void)
+static bool uv_system_inited;
+
+void __init uv_system_init(void)
 {
 	union uvh_si_addr_map_config_u m_n_config;
 	union uvh_node_id_u node_id;
@@ -383,6 +385,7 @@ static __init void uv_system_init(void)
 	map_mmr_high(max_pnode);
 	map_config_high(max_pnode);
 	map_mmioh_high(max_pnode);
+	uv_system_inited = true;
 }
 
 /*
@@ -391,8 +394,7 @@ static __init void uv_system_init(void)
  */
 void __cpuinit uv_cpu_init(void)
 {
-	if (!uv_node_to_blade)
-		uv_system_init();
+	BUG_ON(!uv_system_inited);
 
 	uv_blade_info[uv_numa_blade_id()].nr_online_cpus++;
 
diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c
index e139e617f422..7985c5b3f916 100644
--- a/trunk/arch/x86/kernel/smpboot.c
+++ b/trunk/arch/x86/kernel/smpboot.c
@@ -1221,6 +1221,9 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
 	printk(KERN_INFO "CPU%d: ", 0);
 	print_cpu_info(&cpu_data(0));
 	setup_boot_clock();
+
+	if (is_uv_system())
+		uv_system_init();
 out:
 	preempt_enable();
 }
diff --git a/trunk/include/asm-x86/genapic_32.h b/trunk/include/asm-x86/genapic_32.h
index b02ea6e17de8..754d635f90ff 100644
--- a/trunk/include/asm-x86/genapic_32.h
+++ b/trunk/include/asm-x86/genapic_32.h
@@ -118,6 +118,7 @@ enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC, UV_NON_UNIQUE_APIC};
 #define get_uv_system_type()		UV_NONE
 #define is_uv_system()			0
 #define uv_wakeup_secondary(a, b)	1
+#define uv_system_init()		do {} while (0)
 
 
 #endif
diff --git a/trunk/include/asm-x86/genapic_64.h b/trunk/include/asm-x86/genapic_64.h
index 0f8504627c41..a47d63129135 100644
--- a/trunk/include/asm-x86/genapic_64.h
+++ b/trunk/include/asm-x86/genapic_64.h
@@ -42,6 +42,7 @@ extern int is_uv_system(void);
 extern struct genapic apic_x2apic_uv_x;
 DECLARE_PER_CPU(int, x2apic_extra_bits);
 extern void uv_cpu_init(void);
+extern void uv_system_init(void);
 extern int uv_wakeup_secondary(int phys_apicid, unsigned int start_rip);
 
 extern void setup_apic_routing(void);