kvm: userspace: change vtd.o to iommu.o in Kbuild for IA64
diff mbox

Message ID CF336BA0F635C64F8CC438BC64A259B201C49554F2@PDSMSX501.ccr.corp.intel.com
State Accepted
Headers show

Commit Message

Huang, Wei W Jan. 9, 2009, 7:05 a.m. UTC
vtd.c has been renamed to iommu.c, need to change it in Kbuild accordingly.

Signed-off-by: Wei Huang <wei.w.huang@intel.com>
---
 kernel/ia64/Kbuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-- 
1.6.1.rc3


>-----Original Message-----
>From: Zhang, Xiantao
>Sent: 2009年1月9日 9:41
>To: Amit Shah; Huang, Wei W
>Cc: kvm
>Subject: RE: [PATCH] kvm: userspace: change vtd.o to iommu.o in Kbuild
>
>Amit Shah wrote:
>> On Thu, Jan 08, 2009 at 03:27:12PM +0800, Huang, Wei W wrote:
>>> vtd.c has been renamed to iommu.c, need to change it in Kbuild
>>> accordingly.
>>>
>>> Signed-off-by: Wei Huang <wei.w.huang@intel.com>
>>> ---
>>>  kernel/x86/Kbuild |    2 +-
>>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/kernel/x86/Kbuild b/kernel/x86/Kbuild
>>> index c4723b1..48339b4 100644
>>> --- a/kernel/x86/Kbuild
>>> +++ b/kernel/x86/Kbuild
>>> @@ -10,7 +10,7 @@ ifeq ($(EXT_CONFIG_KVM_TRACE),y)
>>>  kvm-objs += kvm_trace.o
>>>  endif
>>>  ifeq ($(CONFIG_DMAR),y)
>>> -kvm-objs += vtd.o
>>> +kvm-objs += iommu.o
>>
>> This won't be able to build an older kernel.
>
>Please also modify kernel/ia64/Kbuild together.  I don't think it breaks old
>kernels, because userspace build only adopts the latest kvm.git.
>Xiantao
>

Patch
diff mbox

diff --git a/kernel/ia64/Kbuild b/kernel/ia64/Kbuild
index 130ec45..ce3a47a 100644
--- a/kernel/ia64/Kbuild
+++ b/kernel/ia64/Kbuild
@@ -4,7 +4,7 @@  kvm-objs := kvm_main.o ioapic.o coalesced_mmio.o kvm-ia64.o kvm_fw.o \
 	irq_comm.o ../anon_inodes.o ../external-module-compat.o
 
 ifeq ($(CONFIG_DMAR),y)
-kvm-objs += vtd.o
+kvm-objs += iommu.o
 endif
 
 EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127