From ad5a0c1d6cc1467ea65644c3dcd7da38b9c8c78d Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Wed, 15 Aug 2012 16:00:40 +0200 Subject: [PATCH] --- yaml --- r: 329860 b: refs/heads/master c: 8fbe6a541f50eeec5e3e49bd92db23ade9496673 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/kvm.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 720c7f1a1bd9..3edba0f0d03c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28a6fdabb3ea775d3d707afd9d2728b3ced2c34d +refs/heads/master: 8fbe6a541f50eeec5e3e49bd92db23ade9496673 diff --git a/trunk/arch/x86/kernel/kvm.c b/trunk/arch/x86/kernel/kvm.c index c1d61ee4b4f1..1596cc8fd793 100644 --- a/trunk/arch/x86/kernel/kvm.c +++ b/trunk/arch/x86/kernel/kvm.c @@ -354,6 +354,7 @@ static void kvm_pv_guest_cpu_reboot(void *unused) if (kvm_para_has_feature(KVM_FEATURE_PV_EOI)) wrmsrl(MSR_KVM_PV_EOI_EN, 0); kvm_pv_disable_apf(); + kvm_disable_steal_time(); } static int kvm_pv_reboot_notify(struct notifier_block *nb,