Commit:     d1598e05faa11d9f04e0a226122dd57674fb1dab
Parent:     980dbfd421c8d33edbd2fbc8f5a6233ccbefb052
Author:     Jan Beulich <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 3 09:26:21 2007 +0000
Committer:  Tony Luck <[EMAIL PROTECTED]>
CommitDate: Mon Feb 5 14:33:08 2007 -0800

    [IA64] Enable SWIOTLB only when needed
    Don't force CONFIG_SWIOTLB on when not actually needed (i.e. HP_ZX1 and
    Signed-off-by: Jan Beulich <[EMAIL PROTECTED]>
    Signed-off-by: Tony Luck <[EMAIL PROTECTED]>
 arch/ia64/Kconfig |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 4b35c93..f1d2899 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -30,7 +30,6 @@ config MMU
 config SWIOTLB
-       default y
@@ -88,6 +87,7 @@ config IA64_GENERIC
        bool "generic"
        select NUMA
        select ACPI_NUMA
+       select SWIOTLB
          This selects the system type of your hardware.  A "generic" kernel
          will run on any supported IA-64 system.  However, if you configure
@@ -104,6 +104,7 @@ config IA64_GENERIC
 config IA64_DIG
        bool "DIG-compliant"
+       select SWIOTLB
 config IA64_HP_ZX1
        bool "HP-zx1/sx1000"
@@ -113,6 +114,7 @@ config IA64_HP_ZX1
 config IA64_HP_ZX1_SWIOTLB
        bool "HP-zx1/sx1000 with software I/O TLB"
+       select SWIOTLB
          Build a kernel that runs on HP zx1 and sx1000 systems even when they
          have broken PCI devices which cannot DMA to full 32 bits.  Apart
@@ -131,6 +133,7 @@ config IA64_SGI_SN2
 config IA64_HP_SIM
        bool "Ski-simulator"
+       select 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