diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-08-13 09:25:06 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2019-08-16 11:33:57 -0700 |
| commit | df43acac8e32e2ee51a1e9376993c5ac18598d92 (patch) | |
| tree | fd86e0604c0485dd2116e38575806f93189bddb3 /arch/ia64/Kconfig | |
| parent | 2e0f2b1659ddd7bb005ca0bf9f92915904974676 (diff) | |
ia64: remove the zx1 swiotlb machvec
The aim of this machvec is to support devices with < 32-bit dma
masks. But given that ia64 only has a ZONE_DMA32 and not a ZONE_DMA
that isn't supported by swiotlb either.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lkml.kernel.org/r/20190813072514.23299-21-hch@lst.de
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 63db7a5378ac..a42ab41ee8ab 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -138,7 +138,6 @@ config IA64_GENERIC DIG-compliant For DIG ("Developer's Interface Guide") compliant systems DIG+Intel+IOMMU For DIG systems with Intel IOMMU HP-zx1/sx1000 For HP systems - HP-zx1/sx1000+swiotlb For HP systems with (broken) DMA-constrained devices. SGI-UV For SGI UV systems If you don't know what to do, choose "generic". @@ -158,16 +157,6 @@ config IA64_HP_ZX1 Build a kernel that runs on HP zx1 and sx1000 systems. This adds support for the HP I/O MMU. -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 - from support for the HP I/O MMU, this includes support for the software - I/O TLB, which allows supporting the broken devices at the expense of - wasting some kernel memory (about 2MB by default). - config IA64_SGI_UV bool "SGI-UV" select NUMA @@ -350,7 +339,7 @@ config ARCH_SPARSEMEM_ENABLE select SPARSEMEM_VMEMMAP_ENABLE config ARCH_DISCONTIGMEM_DEFAULT - def_bool y if (IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB) + def_bool y if (IA64_GENERIC || IA64_HP_ZX1) depends on ARCH_DISCONTIGMEM_ENABLE config NUMA |