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

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
Signed-off-by: default avatarLinus Torvalds <>
parent 669df1b4
......@@ -480,13 +480,14 @@ config CALGARY_IOMMU
bool "Should Calgary be enabled by default?"
default y
depends on CALGARY_IOMMU
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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment