Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-artful-kernel.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 857f6ef368d462cf29a363c5ec82840b5609f27a..46ef77d5c33263f5ad05192820cd3b12c5fbd90d 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -669,12 +669,16 @@ config IDLE_PAGE_TRACKING
 
          See Documentation/vm/idle_page_tracking.txt for more details.
 
+# arch_add_memory() comprehends device memory
+config ARCH_HAS_ZONE_DEVICE
+       bool
+
 config ZONE_DEVICE
        bool "Device memory (pmem, etc...) hotplug support"
        depends on MEMORY_HOTPLUG
        depends on MEMORY_HOTREMOVE
        depends on SPARSEMEM_VMEMMAP
-       depends on X86_64 #arch_add_memory() comprehends device memory
+       depends on ARCH_HAS_ZONE_DEVICE
 
        help
          Device memory hotplug support allows for establishing pmem,