aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/tsc.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/tsc.c')
-rw-r--r--arch/x86/kernel/tsc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index e41af597aed8..37e7cf544e51 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -1356,6 +1356,9 @@ void __init tsc_init(void)
1356 (unsigned long)cpu_khz / 1000, 1356 (unsigned long)cpu_khz / 1000,
1357 (unsigned long)cpu_khz % 1000); 1357 (unsigned long)cpu_khz % 1000);
1358 1358
1359 /* Sanitize TSC ADJUST before cyc2ns gets initialized */
1360 tsc_store_and_check_tsc_adjust(true);
1361
1359 /* 1362 /*
1360 * Secondary CPUs do not run through tsc_init(), so set up 1363 * Secondary CPUs do not run through tsc_init(), so set up
1361 * all the scale factors for all CPUs, assuming the same 1364 * all the scale factors for all CPUs, assuming the same
@@ -1386,8 +1389,6 @@ void __init tsc_init(void)
1386 1389
1387 if (unsynchronized_tsc()) 1390 if (unsynchronized_tsc())
1388 mark_tsc_unstable("TSCs unsynchronized"); 1391 mark_tsc_unstable("TSCs unsynchronized");
1389 else
1390 tsc_store_and_check_tsc_adjust(true);
1391 1392
1392 check_system_tsc_reliable(); 1393 check_system_tsc_reliable();
1393 1394