aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kvm/Makefile
diff options
context:
space:
mode:
authorZhang xiantao <xiantao.zhang@intel.com>2008-09-11 13:19:32 +0800
committerAvi Kivity <avi@redhat.com>2008-10-15 14:25:32 +0200
commit371c01b28e4049d1fbf60a9631cdad98f7cae030 (patch)
tree84286c5292b404923d8cf730e06d52a332468da6 /arch/x86/kvm/Makefile
parent83dbc83a0d7c88c919d769177bd1924a46c9c034 (diff)
downloadlinux-2.6.34-ux500-371c01b28e4049d1fbf60a9631cdad98f7cae030.tar.gz
KVM: Device Assignment: Move vtd.c from arch/x86/kvm/ to virt/kvm/
Preparation for kvm/ia64 VT-d support. Signed-off-by: Zhang xiantao <xiantao.zhang@intel.com> Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch/x86/kvm/Makefile')
-rw-r--r--arch/x86/kvm/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile
index 3072b17447a..7dce593b9c6 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 \
ifeq ($(CONFIG_KVM_TRACE),y)
common-objs += $(addprefix ../../../virt/kvm/, kvm_trace.o)
endif
+ifeq ($(CONFIG_DMAR),y)
+common-objs += $(addprefix ../../../virt/kvm/, vtd.o)
+endif
EXTRA_CFLAGS += -Ivirt/kvm -Iarch/x86/kvm
kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \
i8254.o
-ifeq ($(CONFIG_DMAR),y)
-kvm-objs += vtd.o
-endif
obj-$(CONFIG_KVM) += kvm.o
kvm-intel-objs = vmx.o
obj-$(CONFIG_KVM_INTEL) += kvm-intel.o