Messages in this thread Patch in this message | | | Date | Thu, 10 Jul 2008 09:50:50 +0900 | Subject | Re: [PATCH 01/34] AMD IOMMU: add Kconfig entry | From | FUJITA Tomonori <> |
| |
On Wed, 9 Jul 2008 10:48:37 +0200 Ingo Molnar <mingo@elte.hu> wrote:
> > * Pavel Machek <pavel@suse.cz> wrote: > > > > +config AMD_IOMMU > > > + bool "AMD IOMMU support" > > > + select SWIOTL > > > > SWIOTLB? > > yep, that typo got already fixed via the patch below. > > Ingo > > ---------------> > commit 07c40e8a1acdb56fca485a6deeb252ebf19509a1 > Author: Ingo Molnar <mingo@elte.hu> > Date: Fri Jun 27 11:31:28 2008 +0200 > > x86, AMD IOMMU: build fix #3 > > fix typo causing: > > arch/x86/kernel/built-in.o: In function `__unmap_single': > amd_iommu.c:(.text+0x17771): undefined reference to `iommu_area_free' > arch/x86/kernel/built-in.o: In function `__map_single': > amd_iommu.c:(.text+0x1797a): undefined reference to `iommu_area_alloc' > amd_iommu.c:(.text+0x179a2): undefined reference to `iommu_area_alloc' > > Signed-off-by: Ingo Molnar <mingo@elte.hu> > > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index 62a2820..8aae462 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -551,7 +551,7 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT > > config AMD_IOMMU > bool "AMD IOMMU support" > - select SWIOTL > + select SWIOTLB > depends on X86_64 && PCI && ACPI > help > Select this to get support for AMD IOMMU hardware in your system.
This fix is fine though the explicit fix is that AMD_IOMMU depends on IOMMU_HELPER since they are the IOMMU helper functions. SWIOTLB requires IOMMU_HELPER so declaring that AMD_IOMMU depends on SWIOTLB properly fixes the problems.
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index f98e1c3..4d85501 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -579,7 +579,7 @@ config SWIOTLB 3 GB of memory. If unsure, say Y. config IOMMU_HELPER - def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB) + def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU) config MAXSMP bool "Configure Maximum number of SMP Processors and NUMA Nodes" depends on X86_64 && SMP
| |