diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-16 19:34:01 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-16 19:34:01 -0500 |
| commit | 3f64116a838e6c3468f9d5eed7f1f87cf3a2c3eb (patch) | |
| tree | 388024d2ddbdcb9991ef4b472dfac31e425b807e /arch/x86/kernel/tsc.c | |
| parent | f3caf8618bce7e86c6f4f86785dd004c71b63a2d (diff) | |
| parent | 4695daefba8df8a11fa0b0edd595eedae9ea59ae (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/x86/kernel/tsc.c')
| -rw-r--r-- | arch/x86/kernel/tsc.c | 5 |
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) (unsigned long)cpu_khz / 1000, (unsigned long)cpu_khz % 1000); + /* Sanitize TSC ADJUST before cyc2ns gets initialized */ + tsc_store_and_check_tsc_adjust(true); + /* * Secondary CPUs do not run through tsc_init(), so set up * all the scale factors for all CPUs, assuming the same @@ -1386,8 +1389,6 @@ void __init tsc_init(void) if (unsynchronized_tsc()) mark_tsc_unstable("TSCs unsynchronized"); - else - tsc_store_and_check_tsc_adjust(true); check_system_tsc_reliable(); |