diff options
| -rw-r--r-- | arch/x86/kvm/Makefile | 7 | ||||
| -rw-r--r-- | virt/kvm/ioapic.c (renamed from arch/x86/kvm/ioapic.c) | 2 | ||||
| -rw-r--r-- | virt/kvm/ioapic.h (renamed from arch/x86/kvm/ioapic.h) | 0 |
3 files changed, 4 insertions, 5 deletions
diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile index af41534af496..ffdd0b310784 100644 --- a/arch/x86/kvm/Makefile +++ b/arch/x86/kvm/Makefile @@ -2,12 +2,11 @@ # Makefile for Kernel-based Virtual Machine module # -common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o) +common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o) -EXTRA_CFLAGS += -I virt/kvm +EXTRA_CFLAGS += -Ivirt/kvm -Iarch/x86/kvm -kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \ - ioapic.o +kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o obj-$(CONFIG_KVM) += kvm.o kvm-intel-objs = vmx.o obj-$(CONFIG_KVM_INTEL) += kvm-intel.o diff --git a/arch/x86/kvm/ioapic.c b/virt/kvm/ioapic.c index 40cd53ed4abd..317f8e211cd2 100644 --- a/arch/x86/kvm/ioapic.c +++ b/virt/kvm/ioapic.c @@ -363,7 +363,7 @@ static void ioapic_mmio_write(struct kvm_io_device *this, gpa_t addr, int len, break; #ifdef CONFIG_IA64 case IOAPIC_REG_EOI: - kvm_ioapic_update_eoi(ioapic, data); + kvm_ioapic_update_eoi(ioapic->kvm, data); break; #endif diff --git a/arch/x86/kvm/ioapic.h b/virt/kvm/ioapic.h index 7f16675fe783..7f16675fe783 100644 --- a/arch/x86/kvm/ioapic.h +++ b/virt/kvm/ioapic.h |