From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH] [KVM-userspace] remove compatibility code related to CONFIG_DMAR Date: Tue, 23 Sep 2008 12:25:28 +0300 Message-ID: <48D8B608.4020707@redhat.com> References: <20080917164457.GB2774@silverwood.ncultra.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: kvm To: ncmike@ncultra.org Return-path: Received: from mx2.redhat.com ([66.187.237.31]:59718 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750892AbYIWJZf (ORCPT ); Tue, 23 Sep 2008 05:25:35 -0400 In-Reply-To: <20080917164457.GB2774@silverwood.ncultra.org> Sender: kvm-owner@vger.kernel.org List-ID: Mike Day wrote: > Compatibility code for intel_iommu no longer needed when > dependency on CONFIG_DMAR removed from kvm kernel build. > > Signed-off-by: Mike D. Day > --- > external-module-compat.c | 11 ----------- > 1 file changed, 11 deletions(-) > > diff --git a/kernel/external-module-compat.c b/kernel/external-module-compat.c > index 4b9a9f2..71429c7 100644 > --- a/kernel/external-module-compat.c > +++ b/kernel/external-module-compat.c > @@ -265,14 +265,3 @@ struct pci_dev *pci_get_bus_and_slot(unsigned int bus, unsigned int devfn) > } > > #endif > - > -#include > - > -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) > - > -int intel_iommu_found() > -{ > - return 0; > -} > - > -#endif > > Older kernels won't have intel_iommu_found() even with your other patch, so this code is still needed. We can't compile the external module on a 2.6.27 tree that has the iommu patched in; we can probably make this work by renaming intel_iommu_found() to kvm_intel_iommu_found() in hack-module.awk. -- error compiling committee.c: too many arguments to function