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 495d7368ced8f4a71dee4dfdf1d1c6ad7786e1ea..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