summaryrefslogtreecommitdiffstats
path: root/arch/ia64/kvm/kvm-ia64.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2012-05-21 21:17:50 +0200
committerH. Peter Anvin <hpa@zytor.com>2012-05-21 21:17:50 +0200
commitd13a822e6d08733cc69dd8c2f5d82eacb1474295 (patch)
tree2b39613c0d8cce9eb3b15adb1525a2c72f46d392 /arch/ia64/kvm/kvm-ia64.c
parentx86, printk: Add missing KERN_CONT to NMI selftest (diff)
parentLinux 3.4 (diff)
downloadlinux-d13a822e6d08733cc69dd8c2f5d82eacb1474295.tar.xz
linux-d13a822e6d08733cc69dd8c2f5d82eacb1474295.zip
Merge commit 'v3.4' into x86/urgent
Diffstat (limited to 'arch/ia64/kvm/kvm-ia64.c')
-rw-r--r--arch/ia64/kvm/kvm-ia64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index f5104b7c52cd..463fb3bbe11e 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -1174,7 +1174,7 @@ out:
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)