Merge tag 'acpi-4.18-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[mirror_ubuntu-hirsute-kernel.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 1d84e61cccfede0d87bc07ee6579549d3f5eebac..809fdd155739b48470b1c32dc5447b32b86e10dc 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -441,15 +441,33 @@ config ARCH_DMA_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
@@ -603,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
@@ -621,20 +642,20 @@ config STRING_SELFTEST
 
 endmenu
 
-config GENERIC_ASHLDI3
+config GENERIC_LIB_ASHLDI3
        bool
 
-config GENERIC_ASHRDI3
+config GENERIC_LIB_ASHRDI3
        bool
 
-config GENERIC_LSHRDI3
+config GENERIC_LIB_LSHRDI3
        bool
 
-config GENERIC_MULDI3
+config GENERIC_LIB_MULDI3
        bool
 
-config GENERIC_CMPDI2
+config GENERIC_LIB_CMPDI2
        bool
 
-config GENERIC_UCMPDI2
+config GENERIC_LIB_UCMPDI2
        bool