Re: [git pull] IOMMU updates for 3.1

[Roedel, Joerg]

On Thu, Jul 07, 2011 at 05:45:58AM -0400, Ingo Molnar wrote:
> >   git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu-3.1
> Fails to build with INTR_REMAP=y && CONFIG_DMAR=n:
> 
>  arch/x86/built-in.o: In function `lapic_resume':
>  apic.c:(.text+0x16329): undefined reference to `intr_remapping_enabled'
>  apic.c:(.text+0x1651d): undefined reference to `intr_remapping_enabled'
>  apic.c:(.text+0x1652b): undefined reference to `reenable_intr_remapping'
>  [...]

Fixed with:

commit 6b385b46ee17d7e1a68d3411b8cdb2342e0f0445
Author: Joerg Roedel <joerg.roedel@xxxxxxx>
Date:   Thu Jul 7 12:18:48 2011 +0200

    iommu/core: Fix build with INTR_REMAP=y && CONFIG_DMAR=n
    
    IOMMU_API is not selected when no DMA remapping driver is
    selected, but the whole drivers/iommu/ directory is only
    built with IOMMU_API=y. Fixed with this patch by including
    the directory with IOMMU_SUPPORT instead.
    
    Signed-off-by: Joerg Roedel <joerg.roedel@xxxxxxx>

diff --git a/drivers/Makefile b/drivers/Makefile
index 2f7a71a..2b551e9 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -122,4 +122,4 @@ obj-y				+= ieee802154/
 obj-y				+= clk/
 
 obj-$(CONFIG_HWSPINLOCK)	+= hwspinlock/
-obj-$(CONFIG_IOMMU_API)		+= iommu/
+obj-$(CONFIG_IOMMU_SUPPORT)	+= iommu/

and pushed result to

	git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu-3.1

again. I just pushed so it may take some time until the result appears
on the mirrors.

Thanks,

	Joerg

-- 
AMD Operating System Research Center

Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
General Managers: Alberto Bozzo, Andrew Bowd
Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/