mem-hotplug: introduce movable_node boot option

[deliverable/linux.git] / arch / x86 / mm / numa.c

diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 8bf93bae1f13f939e2ca88faccd244c2b39df780..24aec58d6afdf4ec75390f15413ed26cb47653e8 100644 (file)
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -567,6 +567,17 @@ static int __init numa_init(int (*init_func)(void))
        ret = init_func();
        if (ret < 0)
                return ret;
+
+       /*
+        * We reset memblock back to the top-down direction
+        * here because if we configured ACPI_NUMA, we have
+        * parsed SRAT in init_func(). It is ok to have the
+        * reset here even if we did't configure ACPI_NUMA
+        * or acpi numa init fails and fallbacks to dummy
+        * numa init.
+        */
+       memblock_set_bottom_up(false);
+
        ret = numa_cleanup_meminfo(&numa_meminfo);
        if (ret < 0)
                return ret;