From 2d1dc4b01a620045cc95ffb9ec37ca34bad3be59 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Sat, 12 Jul 2008 22:52:55 -0700
Subject: [PATCH] --- yaml --- r: 100169 b: refs/heads/master c:
 3d88cca7085cffce077f808f36551e9050eb9e3a h: refs/heads/master i:   100167:
 0a760fcac1deb7c7a1b5add43e1101f3ff2919ed v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/kernel/cpu/intel.c | 4 ++++
 trunk/arch/x86/kernel/numaq_32.c  | 7 ++++---
 trunk/arch/x86/kernel/setup.c     | 8 ++++++++
 trunk/include/asm-x86/numaq.h     | 2 ++
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 932895c8ba15..2f43e2bb75b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b479becdb8c1fb4ff6fbb2a4076c471c737b54c
+refs/heads/master: 3d88cca7085cffce077f808f36551e9050eb9e3a
diff --git a/trunk/arch/x86/kernel/cpu/intel.c b/trunk/arch/x86/kernel/cpu/intel.c
index fe9224c51d37..70609efdf1da 100644
--- a/trunk/arch/x86/kernel/cpu/intel.c
+++ b/trunk/arch/x86/kernel/cpu/intel.c
@@ -226,6 +226,10 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
 
 	if (cpu_has_bts)
 		ds_init_intel(c);
+
+#ifdef CONFIG_X86_NUMAQ
+	numaq_tsc_disable();
+#endif
 }
 
 static unsigned int __cpuinit intel_size_cache(struct cpuinfo_x86 *c, unsigned int size)
diff --git a/trunk/arch/x86/kernel/numaq_32.c b/trunk/arch/x86/kernel/numaq_32.c
index f0f1de1c4a1d..5b20a5e7ac28 100644
--- a/trunk/arch/x86/kernel/numaq_32.c
+++ b/trunk/arch/x86/kernel/numaq_32.c
@@ -93,12 +93,13 @@ int __init get_memcfg_numaq(void)
 	return 1;
 }
 
-static int __init numaq_tsc_disable(void)
+void __init numaq_tsc_disable(void)
 {
+	if (!found_numaq)
+		return -1;
+
 	if (num_online_nodes() > 1) {
 		printk(KERN_DEBUG "NUMAQ: disabling TSC\n");
 		setup_clear_cpu_cap(X86_FEATURE_TSC);
 	}
-	return 0;
 }
-arch_initcall(numaq_tsc_disable);
diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
index 987b6fde3a99..36c540d4ac4b 100644
--- a/trunk/arch/x86/kernel/setup.c
+++ b/trunk/arch/x86/kernel/setup.c
@@ -849,6 +849,14 @@ void __init setup_arch(char **cmdline_p)
 	init_cpu_to_node();
 #endif
 
+#ifdef CONFIG_X86_NUMAQ
+	/*
+	 * need to check online nodes num, call it
+	 * here before time_init/tsc_init
+	 */
+	numaq_tsc_disable();
+#endif
+
 	init_apic_mappings();
 	ioapic_init_mappings();
 
diff --git a/trunk/include/asm-x86/numaq.h b/trunk/include/asm-x86/numaq.h
index ef068d2465d6..34b92d581fa3 100644
--- a/trunk/include/asm-x86/numaq.h
+++ b/trunk/include/asm-x86/numaq.h
@@ -157,6 +157,8 @@ struct sys_cfg_data {
 	struct		eachquadmem eq[MAX_NUMNODES];	/* indexed by quad id */
 };
 
+void numaq_tsc_disable(void);
+
 #else
 static inline int get_memcfg_numaq(void)
 {