From 8a9ea1fb6e7da16ce5ad40a05e3437b39aa56621 Mon Sep 17 00:00:00 2001
From: Dave Hansen <haveblue@us.ibm.com>
Date: Thu, 28 Jul 2005 21:16:18 -0700
Subject: [PATCH] --- yaml --- r: 5414 b: refs/heads/master c:
 e1474e2d9dfb782e6c6517a180b5a8913c69dfad h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/i386/kernel/numaq.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 584ded5fc105..cb8c317ae502 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78fa74a23b16bdb0d944272b696915c4e0bb3ee1
+refs/heads/master: e1474e2d9dfb782e6c6517a180b5a8913c69dfad
diff --git a/trunk/arch/i386/kernel/numaq.c b/trunk/arch/i386/kernel/numaq.c
index e51edf0a6564..5f5b075f860a 100644
--- a/trunk/arch/i386/kernel/numaq.c
+++ b/trunk/arch/i386/kernel/numaq.c
@@ -31,6 +31,7 @@
 #include <linux/nodemask.h>
 #include <asm/numaq.h>
 #include <asm/topology.h>
+#include <asm/processor.h>
 
 #define	MB_TO_PAGES(addr) ((addr) << (20 - PAGE_SHIFT))
 
@@ -77,3 +78,11 @@ int __init get_memcfg_numaq(void)
 	smp_dump_qct();
 	return 1;
 }
+
+static int __init numaq_dsc_disable(void)
+{
+	printk(KERN_DEBUG "NUMAQ: disabling TSC\n");
+	tsc_disable = 1;
+	return 0;
+}
+core_initcall(numaq_dsc_disable);