X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=mm%2FKconfig;h=3e2daef3c946a117bbfa4e63fa6a4fb7bd31a5ad;hb=ed494d4fa234443a005489afb6b9583415ad89ff;hp=2664c118b5d2eea6eee0aae18b9f62c333790a4e;hpb=3ec438afed6f166f1774b3e95b9a65e3b6da5f2c;p=mirror_ubuntu-artful-kernel.git

diff --git a/mm/Kconfig b/mm/Kconfig
index 2664c118b5d2..3e2daef3c946 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -648,7 +648,8 @@ config DEFERRED_STRUCT_PAGE_INIT
 	bool "Defer initialisation of struct pages to kthreads"
 	default n
 	depends on ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT
-	depends on MEMORY_HOTPLUG
+	depends on NO_BOOTMEM && MEMORY_HOTPLUG
+	depends on !FLATMEM
 	help
 	  Ordinarily all struct pages are initialised during early boot in a
 	  single thread. On very large machines this can take a considerable