diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 12:55:52 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 12:55:56 +1100 |
| commit | 2bf88e1cb7b556a34f750e3dff95b03e8ae83606 (patch) | |
| tree | a4d1d02b35b33994322ad917a11e2527891ec1bd /arch/x86/kernel/kvmclock.c | |
| parent | 4923ffc1ba3a1a8fe30418aff905194dee483c15 (diff) | |
| parent | 1098ea741fc4168264185b6782135d029dce435c (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Diffstat (limited to 'arch/x86/kernel/kvmclock.c')
| -rw-r--r-- | arch/x86/kernel/kvmclock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 2a5cafdf8808..542710b99f52 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -107,12 +107,12 @@ static inline void kvm_sched_clock_init(bool stable) { if (!stable) { pv_time_ops.sched_clock = kvm_clock_read; + clear_sched_clock_stable(); return; } kvm_sched_clock_offset = kvm_clock_read(); pv_time_ops.sched_clock = kvm_sched_clock_read; - set_sched_clock_stable(); printk(KERN_INFO "kvm-clock: using sched offset of %llu cycles\n", kvm_sched_clock_offset); |