Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[~andy/linux] / arch / x86 / kvm / irq.c

diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c
index 11c2757b808f9a87a4a87931af45288c097fd87d..96dfbb6ad2a9d2b1db365ef0c007f9d7056d9dda 100644 (file)
--- a/arch/x86/kvm/irq.c
+++ b/arch/x86/kvm/irq.c
@@ -50,7 +50,7 @@ int kvm_cpu_has_interrupt(struct kvm_vcpu *v)
        struct kvm_pic *s;
 
        if (!irqchip_in_kernel(v->kvm))
-               return v->arch.irq_summary;
+               return v->arch.interrupt.pending;
 
        if (kvm_apic_has_interrupt(v) == -1) {  /* LAPIC */
                if (kvm_apic_accept_pic_intr(v)) {
@@ -72,7 +72,7 @@ int kvm_cpu_get_interrupt(struct kvm_vcpu *v)
        int vector;
 
        if (!irqchip_in_kernel(v->kvm))
-               return kvm_pop_irq(v);
+               return v->arch.interrupt.nr;
 
        vector = kvm_get_apic_interrupt(v);     /* APIC */
        if (vector == -1) {