aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/tsc_64.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/x86/kernel/tsc_64.c b/arch/x86/kernel/tsc_64.c
index 322b38c68198..c62f3b6eacc0 100644
--- a/arch/x86/kernel/tsc_64.c
+++ b/arch/x86/kernel/tsc_64.c
@@ -273,15 +273,8 @@ __cpuinit int unsynchronized_tsc(void)
273 return 1; 273 return 1;
274#endif 274#endif
275 275
276 if (boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) { 276 if (boot_cpu_has(X86_FEATURE_CONSTANT_TSC))
277#ifdef CONFIG_ACPI
278 /* But TSC doesn't tick in C3 so don't use it there */
279 if (acpi_gbl_FADT.header.length > 0 &&
280 acpi_gbl_FADT.C3latency < 1000)
281 return 1;
282#endif
283 return 0; 277 return 0;
284 }
285 278
286 /* Assume multi socket systems are not synchronized */ 279 /* Assume multi socket systems are not synchronized */
287 return num_present_cpus() > 1; 280 return num_present_cpus() > 1;