Merge tag 'mips_4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[sfrench/cifs-2.6.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 09565d779324502a7e9d25fa8428d291ee68ad70..809fdd155739b48470b1c32dc5447b32b86e10dc 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -429,15 +429,50 @@ config SGL_ALLOC
        bool
        default n
 
+config NEED_SG_DMA_LENGTH
+       bool
+
+config NEED_DMA_MAP_STATE
+       bool
+
+config ARCH_DMA_ADDR_T_64BIT
+       def_bool 64BIT || PHYS_ADDR_T_64BIT
+
+config IOMMU_HELPER
+       bool
+
+config ARCH_HAS_SYNC_DMA_FOR_DEVICE
+       bool
+
+config ARCH_HAS_SYNC_DMA_FOR_CPU
+       bool
+       select NEED_DMA_MAP_STATE
+
 config DMA_DIRECT_OPS
        bool
-       depends on HAS_DMA && (!64BIT || ARCH_DMA_ADDR_T_64BIT)
-       default n
+       depends on HAS_DMA
+
+config DMA_NONCOHERENT_OPS
+       bool
+       depends on HAS_DMA
+       select DMA_DIRECT_OPS
+
+config DMA_NONCOHERENT_MMAP
+       bool
+       depends on DMA_NONCOHERENT_OPS
+
+config DMA_NONCOHERENT_CACHE_SYNC
+       bool
+       depends on DMA_NONCOHERENT_OPS
 
 config DMA_VIRT_OPS
        bool
-       depends on HAS_DMA && (!64BIT || ARCH_DMA_ADDR_T_64BIT)
-       default n
+       depends on HAS_DMA
+
+config SWIOTLB
+       bool
+       select DMA_DIRECT_OPS
+       select NEED_DMA_MAP_STATE
 
 config CHECK_SIGNATURE
        bool
@@ -586,6 +621,9 @@ config ARCH_HAS_PMEM_API
 config ARCH_HAS_UACCESS_FLUSHCACHE
        bool
 
+config ARCH_HAS_UACCESS_MCSAFE
+       bool
+
 config STACKDEPOT
        bool
        select STACKTRACE