From dfc936f2796bc97bf6940ab13ad7c6afd02328fb Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 1 Jan 2007 10:55:45 -0800 Subject: [PATCH] Revert "[PATCH] x86_64: fix boot hang caused by CALGARY_IOMMU_ENABLED_BY_DEFAULT" This reverts commit e5b07e08d65f0a1c1dba8a96f94cc945b5586e7d. Now that the Calgary code apparently detects itself properly, it's not needed any more. Signed-off-by: Linus Torvalds --- arch/x86_64/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index ef6672455695e..d4275537b25b6 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig @@ -480,13 +480,14 @@ 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 N. + If unsure, say Y. # need this always selected by IOMMU for the VIA workaround config SWIOTLB -- 2.39.5