---

yaml --- r: 115349 b: refs/heads/master c: 371c01b h: refs/heads/master i: 115347: 00afa42 v: v3
git-mirror · Oct 15, 2008 · 548c8f1 · 548c8f1
1 parent 7d1a032
commit 548c8f1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83dbc83a0d7c88c919d769177bd1924a46c9c034
+refs/heads/master: 371c01b28e4049d1fbf60a9631cdad98f7cae030
diff --git a/trunk/arch/x86/kvm/Makefile b/trunk/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

diff --git a/trunk/arch/x86/kvm/vtd.c → trunk/virt/kvm/vtd.c b/trunk/arch/x86/kvm/vtd.c → trunk/virt/kvm/vtd.c