diff options
| author | Jan Beulich <jbeulich@novell.com> | 2007-01-03 09:26:21 +0000 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-02-05 14:33:08 -0800 |
| commit | d1598e05faa11d9f04e0a226122dd57674fb1dab (patch) | |
| tree | 9f7f06af4fb72742a34f3cb13404abc1d57962c8 | |
| parent | 980dbfd421c8d33edbd2fbc8f5a6233ccbefb052 (diff) | |
| download | blackbird-op-linux-d1598e05faa11d9f04e0a226122dd57674fb1dab.tar.gz blackbird-op-linux-d1598e05faa11d9f04e0a226122dd57674fb1dab.zip | |
[IA64] Enable SWIOTLB only when needed
Don't force CONFIG_SWIOTLB on when not actually needed (i.e. HP_ZX1 and
SGI_SN2).
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/Kconfig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 4b35c93eca2f..f1d2899e9a62 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -30,7 +30,6 @@ config MMU config SWIOTLB bool - default y config RWSEM_XCHGADD_ALGORITHM bool @@ -88,6 +87,7 @@ config IA64_GENERIC bool "generic" select NUMA select ACPI_NUMA + select SWIOTLB help 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 help 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 endchoice |
