Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / x86 / kvm / i8254.c

diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
index a6e218c..5a69cce 100644 (file)
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
@@ -220,7 +220,8 @@ void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu)
        struct kvm_pit *pit = vcpu->kvm->arch.vpit;
        struct hrtimer *timer;
 
-       if (!kvm_vcpu_is_bsp(vcpu) || !pit)
+       /* Somewhat arbitrarily make vcpu0 the owner of the PIT. */
+       if (vcpu->vcpu_id || !pit)
                return;
 
        timer = &pit->pit_state.timer;