X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=mm%2FKconfig;h=989f8f3d77e0d7bf552a008f5aee227a5c3ddcd0;hb=3f2b1a04f44933f2d6fe0a9bf9a9c1c452df23f7;hp=520dae6e6ed0560cbeb2450674c279e77b17ec18;hpb=b11a7b94100cba5ec926a181894c2897a22651b9;p=deliverable%2Flinux.git

diff --git a/mm/Kconfig b/mm/Kconfig
index 520dae6e6ed0..989f8f3d77e0 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -653,6 +653,7 @@ config ZONE_DEVICE
 	bool "Device memory (pmem, etc...) hotplug support" if EXPERT
 	depends on MEMORY_HOTPLUG
 	depends on MEMORY_HOTREMOVE
+	depends on SPARSEMEM_VMEMMAP
 	depends on X86_64 #arch_add_memory() comprehends device memory
 
 	help
@@ -666,3 +667,8 @@ config ZONE_DEVICE
 
 config FRAME_VECTOR
 	bool
+
+config ARCH_USES_HIGH_VMA_FLAGS
+	bool
+config ARCH_HAS_PKEYS
+	bool