From f176e01e59e22f2724a01e8074ac26b5fc375a35 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Wed, 30 Jan 2008 13:32:41 +0100
Subject: [PATCH] --- yaml --- r: 80161 b: refs/heads/master c:
 32c7553f824d0d76771404f0e11d6059f82e8de7 h: refs/heads/master i:   80159:
 e3355ff995b519ef0a8bbb57096a719c90be36d7 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/kernel/tsc_64.c | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index f6fb7a9a1f71..ab5d6fd6f6db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51fc97b93545e71cec578d6771bceeb92bc2d50b
+refs/heads/master: 32c7553f824d0d76771404f0e11d6059f82e8de7
diff --git a/trunk/arch/x86/kernel/tsc_64.c b/trunk/arch/x86/kernel/tsc_64.c
index 322b38c68198..c62f3b6eacc0 100644
--- a/trunk/arch/x86/kernel/tsc_64.c
+++ b/trunk/arch/x86/kernel/tsc_64.c
@@ -273,15 +273,8 @@ __cpuinit int unsynchronized_tsc(void)
 		return 1;
 #endif
 
-	if (boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) {
-#ifdef CONFIG_ACPI
-		/* But TSC doesn't tick in C3 so don't use it there */
-		if (acpi_gbl_FADT.header.length > 0 &&
-		    acpi_gbl_FADT.C3latency < 1000)
-			return 1;
-#endif
+	if (boot_cpu_has(X86_FEATURE_CONSTANT_TSC))
 		return 0;
-	}
 
 	/* Assume multi socket systems are not synchronized */
 	return num_present_cpus() > 1;