diff options
-rw-r--r-- | arch/x86/kvm/Makefile | 6 | ||||
-rw-r--r-- | virt/kvm/vtd.c (renamed from arch/x86/kvm/vtd.c) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile index 3072b17447ab..7dce593b9c66 100644 --- a/arch/x86/kvm/Makefile +++ b/arch/x86/kvm/Makefile | |||
@@ -7,14 +7,14 @@ common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \ | |||
7 | ifeq ($(CONFIG_KVM_TRACE),y) | 7 | ifeq ($(CONFIG_KVM_TRACE),y) |
8 | common-objs += $(addprefix ../../../virt/kvm/, kvm_trace.o) | 8 | common-objs += $(addprefix ../../../virt/kvm/, kvm_trace.o) |
9 | endif | 9 | endif |
10 | ifeq ($(CONFIG_DMAR),y) | ||
11 | common-objs += $(addprefix ../../../virt/kvm/, vtd.o) | ||
12 | endif | ||
10 | 13 | ||
11 | EXTRA_CFLAGS += -Ivirt/kvm -Iarch/x86/kvm | 14 | EXTRA_CFLAGS += -Ivirt/kvm -Iarch/x86/kvm |
12 | 15 | ||
13 | kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \ | 16 | kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \ |
14 | i8254.o | 17 | i8254.o |
15 | ifeq ($(CONFIG_DMAR),y) | ||
16 | kvm-objs += vtd.o | ||
17 | endif | ||
18 | obj-$(CONFIG_KVM) += kvm.o | 18 | obj-$(CONFIG_KVM) += kvm.o |
19 | kvm-intel-objs = vmx.o | 19 | kvm-intel-objs = vmx.o |
20 | obj-$(CONFIG_KVM_INTEL) += kvm-intel.o | 20 | obj-$(CONFIG_KVM_INTEL) += kvm-intel.o |
diff --git a/arch/x86/kvm/vtd.c b/virt/kvm/vtd.c index a770874f3a3a..a770874f3a3a 100644 --- a/arch/x86/kvm/vtd.c +++ b/virt/kvm/vtd.c | |||