aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/tsc.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index f4dfdaa6633c..0ff1ec61d1e4 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -1299,13 +1299,8 @@ static int __init init_tsc_clocksource(void)
1299 /* 1299 /*
1300 * When TSC frequency is known (retrieved via MSR or CPUID), we skip 1300 * When TSC frequency is known (retrieved via MSR or CPUID), we skip
1301 * the refined calibration and directly register it as a clocksource. 1301 * the refined calibration and directly register it as a clocksource.
1302 *
1303 * We still keep the TSC_RELIABLE flag here to avoid regressions -
1304 * it will be removed after all the conversion for other code paths
1305 * connected to this flag is done.
1306 */ 1302 */
1307 if (boot_cpu_has(X86_FEATURE_TSC_RELIABLE) || 1303 if (boot_cpu_has(X86_FEATURE_TSC_KNOWN_FREQ)) {
1308 boot_cpu_has(X86_FEATURE_TSC_KNOWN_FREQ)) {
1309 clocksource_register_khz(&clocksource_tsc, tsc_khz); 1304 clocksource_register_khz(&clocksource_tsc, tsc_khz);
1310 return 0; 1305 return 0;
1311 } 1306 }