memblock: make memblock_set_node() support different memblock_type

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / powerpc / mm / numa.c

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 078d3e0..5a944f2 100644 (file)
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -670,7 +670,8 @@ static void __init parse_drconf_memory(struct device_node *memory)
                        node_set_online(nid);
                        sz = numa_enforce_memory_limit(base, size);
                        if (sz)
-                               memblock_set_node(base, sz, nid);
+                               memblock_set_node(base, sz,
+                                                 &memblock.memory, nid);
                } while (--ranges);
        }
 }
@@ -760,7 +761,7 @@ new_range:
                                continue;
                }
 
-               memblock_set_node(start, size, nid);
+               memblock_set_node(start, size, &memblock.memory, nid);
 
                if (--ranges)
                        goto new_range;
@@ -797,7 +798,8 @@ static void __init setup_nonnuma(void)
 
                fake_numa_create_new_node(end_pfn, &nid);
                memblock_set_node(PFN_PHYS(start_pfn),
-                                 PFN_PHYS(end_pfn - start_pfn), nid);
+                                 PFN_PHYS(end_pfn - start_pfn),
+                                 &memblock.memory, nid);
                node_set_online(nid);
        }
 }