x86, numa, bootmem: Only free bootmem on NUMA failure path

In the NUMA bootmem setup failure path we freed nodedata_phys
incorrectly.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: David Rientjes <rientjes@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <4B07A739.3030104@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index 086f98a66d80a3291fda61afe2933779ec462877..3acd870d316a84533c219638638ed8ed77d428f1 100644 (file)
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -239,8 +239,14 @@ setup_node_bootmem(int nodeid, unsigned long start, unsigned long end)
        bootmap = early_node_mem(nodeid, bootmap_start, end,
                                 bootmap_pages<<PAGE_SHIFT, PAGE_SIZE);
        if (bootmap == NULL)  {
-               if (nodedata_phys < start || nodedata_phys >= end)
-                       free_bootmem(nodedata_phys, pgdat_size);
+               if (nodedata_phys < start || nodedata_phys >= end) {
+                       /*
+                        * only need to free it if it is from other node
+                        * bootmem
+                        */
+                       if (nid != nodeid)
+                               free_bootmem(nodedata_phys, pgdat_size);
+               }
                node_data[nodeid] = NULL;
                return;
        }