From: Joerg Roedel Date: Tue, 18 Nov 2008 11:44:21 +0000 (+0100) Subject: x86: default to SWIOTLB=y on x86_64 X-Git-Tag: v2.6.27.12~69 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11fea7ace7b0086f853854df8653d1c8f90a9fb9;p=thirdparty%2Fkernel%2Fstable.git x86: default to SWIOTLB=y on x86_64 commit a1afd01c175324656d0e8f1c82ea94b474953c04 upstream. Impact: fixes korg bugzilla 11980 A kernel for a 64bit x86 system should always contain the swiotlb code in case it is booted on a machine without any hardware IOMMU supported by the kernel and more than 4GB of RAM. This patch changes Kconfig to always compile swiotlb into the kernel for x86_64. Signed-off-by: Joerg Roedel Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 552d2b7a344c0..388bae2bff8fd 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -567,7 +567,7 @@ config AMD_IOMMU # need this always selected by IOMMU for the VIA workaround config SWIOTLB - bool + def_bool y if X86_64 help Support for software bounce buffers used on x86-64 systems which don't have a hardware IOMMU (e.g. the current generation