summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2007-01-01 10:55:45 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2007-01-01 10:55:45 -0800
commit36f696cd7ffc82c48bf5826bbb4e005370fb9c6a (patch)
tree30ef8864d8b1b730ae275b6c3f743035df915fa4 /arch
parent669df1b478803f49a356528d290af7bf442eb3be (diff)
downloadop-kernel-dev-36f696cd7ffc82c48bf5826bbb4e005370fb9c6a.zip
op-kernel-dev-36f696cd7ffc82c48bf5826bbb4e005370fb9c6a.tar.gz
Revert "[PATCH] x86_64: fix boot hang caused by CALGARY_IOMMU_ENABLED_BY_DEFAULT"
This reverts commit a9622f6219ce58faba1417743bf3078501eb3434. Now that the Calgary code apparently detects itself properly, it's not needed any more. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/Kconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index ef66724..d427553 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
OpenPOWER on IntegriCloud