diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-03 17:41:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-03 17:41:06 -0700 |
| commit | a92ad11fb209c8de0d358b78415fda5f01308202 (patch) | |
| tree | 943c23aa66079b42abe4399ba442aefbb4dcadab /arch/x86 | |
| parent | 5183a617ecbf01805c4abb33c3165a276eec7234 (diff) | |
| parent | 898ec52d2ba05915aaedcdb21bff2e944c883cb8 (diff) | |
| download | linux-stable-a92ad11fb209c8de0d358b78415fda5f01308202.tar.gz linux-stable-a92ad11fb209c8de0d358b78415fda5f01308202.tar.bz2 linux-stable-a92ad11fb209c8de0d358b78415fda5f01308202.zip | |
Merge tag 'x86-timers-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 timer update from Ingo Molnar:
"Set the X86_FEATURE_TSC_KNOWN_FREQ flag for Xen guests, to avoid
recalibration"
* tag 'x86-timers-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/xen/time: Set the X86_FEATURE_TSC_KNOWN_FREQ flag in xen_tsc_khz()
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/xen/time.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index c8897aad13cd..91f5b330dcc6 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -39,6 +39,7 @@ static unsigned long xen_tsc_khz(void) struct pvclock_vcpu_time_info *info = &HYPERVISOR_shared_info->vcpu_info[0].time; + setup_force_cpu_cap(X86_FEATURE_TSC_KNOWN_FREQ); return pvclock_tsc_khz(info); } |