Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[linux-drm-fsl-dcu.git] / arch / powerpc / mm / mem.c

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index b1c5734bc2ce5ebe325b47024cd88172872f038b..4b5cd5c2594d9b5ca507bc80751f6d1003fde4d6 100644 (file)
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -209,7 +209,7 @@ void __init do_init_bootmem(void)
        /* Place all memblock_regions in the same node and merge contiguous
         * memblock_regions
         */
-       memblock_set_node(0, (phys_addr_t)ULLONG_MAX, 0);
+       memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock.memory, 0);
 
        /* Add all physical memory to the bootmem map, mark each area
         * present.