diff options
| author | Joel Stanley <joel@jms.id.au> | 2019-12-12 01:32:01 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2019-12-12 01:32:06 +0300 |
| commit | fdc60468f3e452364d432f1a7c3f83d58bba1b84 (patch) | |
| tree | de7197f150958ae72cb87b6cf4885610f3edd704 /arch/x86/kernel/tsc.c | |
| parent | 20572eecd7248b66d855a8e4812debd9f828ccba (diff) | |
| parent | 8539dfa4fcbcf58c3c2f92ac57b964add884d12b (diff) | |
| download | linux-dev-5.3.tar.xz | |
Merge tag 'v5.3.15' into dev-5.3dev-5.3
This is the 5.3.15 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'arch/x86/kernel/tsc.c')
| -rw-r--r-- | arch/x86/kernel/tsc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 57d87f79558f..04dd3cc6c6ed 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -1505,6 +1505,9 @@ void __init tsc_init(void) return; } + if (tsc_clocksource_reliable || no_tsc_watchdog) + clocksource_tsc_early.flags &= ~CLOCK_SOURCE_MUST_VERIFY; + clocksource_register_khz(&clocksource_tsc_early, tsc_khz); detect_art(); } |