diff --git a/[refs] b/[refs] index d33e5ee41570..aeba248d465c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b159d43fbf7eaaac6ecc647f51cf4257332db47b +refs/heads/master: af705362ab6018071310c5fcd436a6b457517d5f diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig index a8128f997339..3b7248126d29 100644 --- a/trunk/arch/i386/Kconfig +++ b/trunk/arch/i386/Kconfig @@ -793,7 +793,7 @@ config HAVE_ARCH_BOOTMEM_NODE depends on NUMA default y -config HAVE_MEMORY_PRESENT +config ARCH_HAVE_MEMORY_PRESENT bool depends on DISCONTIGMEM default y diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig index 8283685f3bb3..5127441561b4 100644 --- a/trunk/mm/Kconfig +++ b/trunk/mm/Kconfig @@ -53,3 +53,7 @@ config FLATMEM config NEED_MULTIPLE_NODES def_bool y depends on DISCONTIGMEM || NUMA + +config HAVE_MEMORY_PRESENT + def_bool y + depends on ARCH_HAVE_MEMORY_PRESENT