diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2015-05-13 09:59:26 -0400 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-05-19 14:52:37 -0400 |
commit | c35ebbeade127e7bca1f21ef5bf1a39deffba9de (patch) | |
tree | cb39a928310d7aa9373913cf14dedb0827edf3e9 /arch/x86/kernel/kvmclock.c | |
parent | edc90b7dc4ceef62ef0ad9cc6c3f5dc770e83ad2 (diff) |
Revert "kvmclock: set scheduler clock stable"
This reverts commit ff7bbb9c6ab6e6620429daeff39424bbde1a94b4.
Sasha Levin is seeing odd jump in time values during boot of a KVM guest:
[...]
[ 0.000000] tsc: Detected 2260.998 MHz processor
[3376355.247558] Calibrating delay loop (skipped) preset value..
[...]
and bisected them to this commit.
Reported-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kernel/kvmclock.c')
-rw-r--r-- | arch/x86/kernel/kvmclock.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 4e03921761c4..42caaef897c8 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/percpu.h> | 24 | #include <linux/percpu.h> |
25 | #include <linux/hardirq.h> | 25 | #include <linux/hardirq.h> |
26 | #include <linux/memblock.h> | 26 | #include <linux/memblock.h> |
27 | #include <linux/sched.h> | ||
28 | 27 | ||
29 | #include <asm/x86_init.h> | 28 | #include <asm/x86_init.h> |
30 | #include <asm/reboot.h> | 29 | #include <asm/reboot.h> |
@@ -266,8 +265,6 @@ void __init kvmclock_init(void) | |||
266 | 265 | ||
267 | if (kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE_STABLE_BIT)) | 266 | if (kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE_STABLE_BIT)) |
268 | pvclock_set_flags(PVCLOCK_TSC_STABLE_BIT); | 267 | pvclock_set_flags(PVCLOCK_TSC_STABLE_BIT); |
269 | |||
270 | set_sched_clock_stable(); | ||
271 | } | 268 | } |
272 | 269 | ||
273 | int __init kvm_setup_vsyscall_timeinfo(void) | 270 | int __init kvm_setup_vsyscall_timeinfo(void) |