X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=mm%2FKconfig;h=363ee0ca189ff543907284e6801c936e5c0dbb24;hb=0fe5b1cc7de3dd7401c4855b44725cd8781b2440;hp=03cbfa072f42a7378ed57b8b1060641b31e7d97e;hpb=400e91bde1f8d3fe27cfb9e1eca1278c84454caf;p=karo-tx-linux.git

diff --git a/mm/Kconfig b/mm/Kconfig
index 03cbfa072f42..363ee0ca189f 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -652,8 +652,6 @@ config IDLE_PAGE_TRACKING
 
 config ZONE_DEVICE
 	bool "Device memory (pmem, etc...) hotplug support" if EXPERT
-	default !ZONE_DMA
-	depends on !ZONE_DMA
 	depends on MEMORY_HOTPLUG
 	depends on MEMORY_HOTREMOVE
 	depends on X86_64 #arch_add_memory() comprehends device memory
@@ -667,5 +665,10 @@ config ZONE_DEVICE
 
 	  If FS_DAX is enabled, then say Y.
 
+config NR_ZONES_EXTENDED
+	bool
+	default n if !64BIT
+	default y if ZONE_DEVICE && ZONE_DMA && ZONE_DMA32
+
 config FRAME_VECTOR
 	bool