Commit:     36f696cd7ffc82c48bf5826bbb4e005370fb9c6a
Parent:     669df1b478803f49a356528d290af7bf442eb3be
Author:     Linus Torvalds <[EMAIL PROTECTED]>
AuthorDate: Mon Jan 1 10:55:45 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Jan 1 10:55:45 2007 -0800

    Revert "[PATCH] x86_64: fix boot hang caused by 
    This reverts commit a9622f6219ce58faba1417743bf3078501eb3434.  Now that
    the Calgary code apparently detects itself properly, it's not needed any
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 arch/x86_64/Kconfig |    5 +++--
 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
        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
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to