Merge tag 'gvt-next-fixes-2019-09-06' of https://github.com/intel/gvt-linux into...

[linux.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 0b4352557dd54643c05ccc52e6c48de6b42a5a06..56cec636a1fc3ce1fe4db1d87cd39eda85d81451 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -649,8 +649,7 @@ config IDLE_PAGE_TRACKING
          See Documentation/admin-guide/mm/idle_page_tracking.rst for
          more details.
 
-# arch_add_memory() comprehends device memory
-config ARCH_HAS_ZONE_DEVICE
+config ARCH_HAS_PTE_DEVMAP
        bool
 
 config ZONE_DEVICE
@@ -658,7 +657,7 @@ config ZONE_DEVICE
        depends on MEMORY_HOTPLUG
        depends on MEMORY_HOTREMOVE
        depends on SPARSEMEM_VMEMMAP
-       depends on ARCH_HAS_ZONE_DEVICE
+       depends on ARCH_HAS_PTE_DEVMAP
        select XARRAY_MULTI
 
        help
@@ -670,47 +669,17 @@ config ZONE_DEVICE
 
          If FS_DAX is enabled, then say Y.
 
-config ARCH_HAS_HMM_MIRROR
-       bool
-       default y
-       depends on (X86_64 || PPC64)
-       depends on MMU && 64BIT
-
-config ARCH_HAS_HMM_DEVICE
-       bool
-       default y
-       depends on (X86_64 || PPC64)
-       depends on MEMORY_HOTPLUG
-       depends on MEMORY_HOTREMOVE
-       depends on SPARSEMEM_VMEMMAP
-       depends on ARCH_HAS_ZONE_DEVICE
-       select XARRAY_MULTI
-
-config ARCH_HAS_HMM
-       bool
-       default y
-       depends on (X86_64 || PPC64)
-       depends on ZONE_DEVICE
-       depends on MMU && 64BIT
-       depends on MEMORY_HOTPLUG
-       depends on MEMORY_HOTREMOVE
-       depends on SPARSEMEM_VMEMMAP
-
 config MIGRATE_VMA_HELPER
        bool
 
 config DEV_PAGEMAP_OPS
        bool
 
-config HMM
-       bool
-       select MMU_NOTIFIER
-       select MIGRATE_VMA_HELPER
-
 config HMM_MIRROR
        bool "HMM mirror CPU page table into a device page table"
-       depends on ARCH_HAS_HMM
-       select HMM
+       depends on (X86_64 || PPC64)
+       depends on MMU && 64BIT
+       select MMU_NOTIFIER
        help
          Select HMM_MIRROR if you want to mirror range of the CPU page table of a
          process into a device page table. Here, mirror means "keep synchronized".
@@ -720,8 +689,7 @@ config HMM_MIRROR
 
 config DEVICE_PRIVATE
        bool "Unaddressable device memory (GPU memory, ...)"
-       depends on ARCH_HAS_HMM
-       select HMM
+       depends on ZONE_DEVICE
        select DEV_PAGEMAP_OPS
 
        help
@@ -729,17 +697,6 @@ config DEVICE_PRIVATE
          memory; i.e., memory that is only accessible from the device (or
          group of devices). You likely also want to select HMM_MIRROR.
 
-config DEVICE_PUBLIC
-       bool "Addressable device memory (like GPU memory)"
-       depends on ARCH_HAS_HMM
-       select HMM
-       select DEV_PAGEMAP_OPS
-
-       help
-         Allows creation of struct pages to represent addressable device
-         memory; i.e., memory that is accessible from both the device and
-         the CPU
-
 config FRAME_VECTOR
        bool