OSDN Git Service

Revert "kvmclock: set scheduler clock stable"
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 13 May 2015 13:59:26 +0000 (15:59 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 19 May 2015 18:52:37 +0000 (20:52 +0200)
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>
arch/x86/kernel/kvmclock.c

index 4e03921..42caaef 100644 (file)
@@ -24,7 +24,6 @@
 #include <linux/percpu.h>
 #include <linux/hardirq.h>
 #include <linux/memblock.h>
-#include <linux/sched.h>
 
 #include <asm/x86_init.h>
 #include <asm/reboot.h>
@@ -266,8 +265,6 @@ void __init kvmclock_init(void)
 
        if (kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE_STABLE_BIT))
                pvclock_set_flags(PVCLOCK_TSC_STABLE_BIT);
-
-       set_sched_clock_stable();
 }
 
 int __init kvm_setup_vsyscall_timeinfo(void)