From ecf043682a26737e92e73a7ed23c69cfd8d68b00 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Wed, 18 Apr 2012 19:23:50 +0300 Subject: [PATCH] --- yaml --- r: 300119 b: refs/heads/master c: 331b646d60b0c3885208e1e02bd9f40319953efc h: refs/heads/master i: 300117: d28bca300a9137da7db75c55ae96a77dce18001a 300115: 547607ba3727861eafa8a8e9b12085ddadb76f50 300111: 6125d74577e429f6a9eeb4677c8353ddf2b5dd80 v: v3 --- [refs] | 2 +- trunk/arch/ia64/kvm/kvm-ia64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 30faf9c3040f..88de93ed5d73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de6c0b02d4d7bdf2587e679a6ddbb71b7d68bb89 +refs/heads/master: 331b646d60b0c3885208e1e02bd9f40319953efc diff --git a/trunk/arch/ia64/kvm/kvm-ia64.c b/trunk/arch/ia64/kvm/kvm-ia64.c index f5104b7c52cd..463fb3bbe11e 100644 --- a/trunk/arch/ia64/kvm/kvm-ia64.c +++ b/trunk/arch/ia64/kvm/kvm-ia64.c @@ -1174,7 +1174,7 @@ static enum hrtimer_restart hlt_timer_fn(struct hrtimer *data) bool kvm_vcpu_compatible(struct kvm_vcpu *vcpu) { - return irqchip_in_kernel(vcpu->kcm) == (vcpu->arch.apic != NULL); + return irqchip_in_kernel(vcpu->kvm) == (vcpu->arch.apic != NULL); } int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)