Commit 36f696cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "[PATCH] x86_64: fix boot hang caused by CALGARY_IOMMU_ENABLED_BY_DEFAULT" 



This reverts commit a9622f62.  Now that
the Calgary code apparently detects itself properly, it's not needed any
more.

Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 669df1b4

arch/x86_64/Kconfig

+3 −2
Original line number Original line Diff line number Diff line
@@ -480,13 +480,14 @@ config CALGARY_IOMMU 




config CALGARY_IOMMU_ENABLED_BY_DEFAULT

config CALGARY_IOMMU_ENABLED_BY_DEFAULT

	bool "Should Calgary be enabled by default?"

	bool "Should Calgary be enabled by default?"

	default y

	depends on CALGARY_IOMMU

	depends on CALGARY_IOMMU

	help

	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

	  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

	  used even if it exists. If you choose 'n' and would like to use

	  Calgary anyway, pass 'iommu=calgary' on the kernel command line.

	  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

# need this always selected by IOMMU for the VIA workaround

config SWIOTLB

config SWIOTLB