scatterlist: move the NEED_SG_DMA_LENGTH config symbol to lib/Kconfig

This way we have one central definition of it, and user can select it as
needed.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Anshuman Khandual <khandual@linux.vnet.ibm.com>

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 3ff735a..8e6a67e 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -10,6 +10,7 @@ config ALPHA
        select HAVE_OPROFILE
        select HAVE_PCSPKR_PLATFORM
        select HAVE_PERF_EVENTS
+       select NEED_SG_DMA_LENGTH
        select VIRT_TO_BUS
        select GENERIC_IRQ_PROBE
        select AUTO_IRQ_AFFINITY if SMP
@@ -70,9 +71,6 @@ config ARCH_DMA_ADDR_T_64BIT
 config NEED_DMA_MAP_STATE
        def_bool y
 
-config NEED_SG_DMA_LENGTH
-       def_bool y
-
 config GENERIC_ISA_DMA
        bool
        default y

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6bbf7b9..0d2930d 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -118,9 +118,6 @@ config ARM_HAS_SG_CHAIN
        select ARCH_HAS_SG_CHAIN
        bool
 
-config NEED_SG_DMA_LENGTH
-       bool
-
 config ARM_DMA_USE_IOMMU
        bool
        select ARM_HAS_SG_CHAIN

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index a553deb..eab772a 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -132,6 +132,7 @@ config ARM64
        select IRQ_FORCED_THREADING
        select MODULES_USE_ELF_RELA
        select MULTI_IRQ_HANDLER
+       select NEED_SG_DMA_LENGTH
        select NO_BOOTMEM
        select OF
        select OF_EARLY_FLATTREE
@@ -242,9 +243,6 @@ config ARCH_DMA_ADDR_T_64BIT
 config NEED_DMA_MAP_STATE
        def_bool y
 
-config NEED_SG_DMA_LENGTH
-       def_bool y
-
 config SMP
        def_bool y
 

diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index 76d2f20..37adb20 100644 (file)
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -19,6 +19,7 @@ config HEXAGON
        select GENERIC_IRQ_SHOW
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK
+       select NEED_SG_DMA_LENGTH
        select NO_IOPORT_MAP
        select GENERIC_IOMAP
        select GENERIC_SMP_IDLE_THREAD
@@ -63,9 +64,6 @@ config GENERIC_CSUM
 config GENERIC_IRQ_PROBE
        def_bool y
 
-config NEED_SG_DMA_LENGTH
-       def_bool y
-
 config RWSEM_GENERIC_SPINLOCK
        def_bool n
 

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index ec2a397..5381e46 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -53,6 +53,7 @@ config IA64
        select MODULES_USE_ELF_RELA
        select ARCH_USE_CMPXCHG_LOCKREF
        select HAVE_ARCH_AUDITSYSCALL
+       select NEED_SG_DMA_LENGTH
        default y
        help
          The Itanium Processor Family is Intel's 64-bit successor to
@@ -83,9 +84,6 @@ config ARCH_DMA_ADDR_T_64BIT
 config NEED_DMA_MAP_STATE
        def_bool y
 
-config NEED_SG_DMA_LENGTH
-       def_bool y
-
 config SWIOTLB
        bool
 

diff --git a/arch/mips/cavium-octeon/Kconfig b/arch/mips/cavium-octeon/Kconfig
index 647ed15..5d73041 100644 (file)
--- a/arch/mips/cavium-octeon/Kconfig
+++ b/arch/mips/cavium-octeon/Kconfig
@@ -67,9 +67,6 @@ config CAVIUM_OCTEON_LOCK_L2_MEMCPY
        help
          Lock the kernel's implementation of memcpy() into L2.
 
-config NEED_SG_DMA_LENGTH
-       bool
-
 config SWIOTLB
        def_bool y
        select DMA_DIRECT_OPS

diff --git a/arch/mips/loongson64/Kconfig b/arch/mips/loongson64/Kconfig
index 5efb2e6..641a147 100644 (file)
--- a/arch/mips/loongson64/Kconfig
+++ b/arch/mips/loongson64/Kconfig
@@ -130,9 +130,6 @@ config LOONGSON_UART_BASE
        default y
        depends on EARLY_PRINTK || SERIAL_8250
 
-config NEED_SG_DMA_LENGTH
-       bool
-
 config SWIOTLB
        bool "Soft IOMMU Support for All-Memory DMA"
        default y

diff --git a/arch/mips/netlogic/Kconfig b/arch/mips/netlogic/Kconfig
index 5c5ee0e..412351c 100644 (file)
--- a/arch/mips/netlogic/Kconfig
+++ b/arch/mips/netlogic/Kconfig
@@ -83,7 +83,4 @@ endif
 config NLM_COMMON
        bool
 
-config NEED_SG_DMA_LENGTH
-       bool
-
 endif

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index fc5a574..89caea8 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -51,6 +51,7 @@ config PARISC
        select GENERIC_CLOCKEVENTS
        select ARCH_NO_COHERENT_DMA_MMAP
        select CPU_NO_EFFICIENT_FFS
+       select NEED_SG_DMA_LENGTH
 
        help
          The PA-RISC microprocessor is designed by Hewlett-Packard and used
@@ -114,9 +115,6 @@ config STACKTRACE_SUPPORT
 config NEED_DMA_MAP_STATE
        def_bool y
 
-config NEED_SG_DMA_LENGTH
-       def_bool y
-
 config ISA_DMA_API
        bool
 

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index bd1cd84..fbb4d5d 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -226,6 +226,7 @@ config PPC
        select IRQ_DOMAIN
        select IRQ_FORCED_THREADING
        select MODULES_USE_ELF_RELA
+       select NEED_SG_DMA_LENGTH
        select NO_BOOTMEM
        select OF
        select OF_EARLY_FLATTREE
@@ -909,9 +910,6 @@ config ZONE_DMA
 config NEED_DMA_MAP_STATE
        def_bool (PPC64 || NOT_COHERENT_CACHE)
 
-config NEED_SG_DMA_LENGTH
-       def_bool y
-
 config GENERIC_ISA_DMA
        bool
        depends on ISA_DMA_API

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 89c0c72..a36b4e4 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -710,6 +710,7 @@ menuconfig PCI
        select PCI_MSI
        select IOMMU_HELPER
        select IOMMU_SUPPORT
+       select NEED_SG_DMA_LENGTH
 
        help
          Enable PCI support.
@@ -734,9 +735,6 @@ config PCI_DOMAINS
 config HAS_IOMEM
        def_bool PCI
 
-config NEED_SG_DMA_LENGTH
-       def_bool PCI
-
 config NEED_DMA_MAP_STATE
        def_bool PCI
 

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 61f4e2e..a0f1c4a 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -49,6 +49,8 @@ config SUPERH
        select HAVE_ARCH_AUDITSYSCALL
        select HAVE_FUTEX_CMPXCHG if FUTEX
        select HAVE_NMI
+       select NEED_SG_DMA_LENGTH
+
        help
          The SuperH is a RISC processor targeted for use in embedded systems
          and consumer electronics; it was also used in the Sega Dreamcast
@@ -162,9 +164,6 @@ config DMA_NONCOHERENT
 config NEED_DMA_MAP_STATE
        def_bool DMA_NONCOHERENT
 
-config NEED_SG_DMA_LENGTH
-       def_bool y
-
 config PGTABLE_LEVELS
        default 3 if X2TLB
        default 2

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 3c1740a..a2f4483 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -43,6 +43,7 @@ config SPARC
        select ARCH_HAS_SG_CHAIN
        select CPU_NO_EFFICIENT_FFS
        select LOCKDEP_SMALL if LOCKDEP
+       select NEED_SG_DMA_LENGTH
 
 config SPARC32
        def_bool !64BIT
@@ -145,9 +146,6 @@ config ZONE_DMA
 config NEED_DMA_MAP_STATE
        def_bool y
 
-config NEED_SG_DMA_LENGTH
-       def_bool y
-
 config GENERIC_ISA_DMA
        bool
        default y if SPARC32

diff --git a/arch/unicore32/mm/Kconfig b/arch/unicore32/mm/Kconfig
index 3f105e0..1d9fed0 100644 (file)
--- a/arch/unicore32/mm/Kconfig
+++ b/arch/unicore32/mm/Kconfig
@@ -43,7 +43,4 @@ config CPU_TLB_SINGLE_ENTRY_DISABLE
 config SWIOTLB
        def_bool y
        select DMA_DIRECT_OPS
-
-config NEED_SG_DMA_LENGTH
-       def_bool SWIOTLB
-
+       select NEED_SG_DMA_LENGTH

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 4faa505..9cbadd6 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -183,6 +183,7 @@ config X86
        select HAVE_UNSTABLE_SCHED_CLOCK
        select HAVE_USER_RETURN_NOTIFIER
        select IRQ_FORCED_THREADING
+       select NEED_SG_DMA_LENGTH
        select PCI_LOCKLESS_CONFIG
        select PERF_EVENTS
        select RTC_LIB
@@ -239,9 +240,6 @@ config NEED_DMA_MAP_STATE
        def_bool y
        depends on X86_64 || INTEL_IOMMU || DMA_API_DEBUG || SWIOTLB
 
-config NEED_SG_DMA_LENGTH
-       def_bool y
-
 config GENERIC_ISA_DMA
        def_bool y
        depends on ISA_DMA_API

diff --git a/lib/Kconfig b/lib/Kconfig
index 2f69085..aeb7fae 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -429,6 +429,9 @@ config SGL_ALLOC
        bool
        default n
 
+config NEED_SG_DMA_LENGTH
+       bool
+
 config IOMMU_HELPER
        bool