[PATCH] x86_64: fix boot hang caused by CALGARY_IOMMU_ENABLED_BY_DEFAULT

[sfrench/cifs-2.6.git] / arch / x86_64 / Kconfig

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index d4275537b25b6e8bc814f19215278da2633420f3..ef6672455695ebfe5f6700f40fd5e5f4e3104345 100644 (file)
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -480,14 +480,13 @@ config CALGARY_IOMMU
 
 config CALGARY_IOMMU_ENABLED_BY_DEFAULT
        bool "Should Calgary be enabled by default?"
-       default y
        depends on CALGARY_IOMMU
        help
-         Should Calgary be enabled by default? if you choose 'y', Calgary
+         Should Calgary be enabled by default? If you choose 'y', Calgary
          will be used (if it exists). If you choose 'n', Calgary will not be
          used even if it exists. If you choose 'n' and would like to use
          Calgary anyway, pass 'iommu=calgary' on the kernel command line.
-         If unsure, say Y.
+         If unsure, say N.
 
 # need this always selected by IOMMU for the VIA workaround
 config SWIOTLB