Merge branch 'akpm-current/current'

[karo-tx-linux.git] / arch / metag / mm / numa.c

diff --git a/arch/metag/mm/numa.c b/arch/metag/mm/numa.c
index b172aa45fcf8201934880a0ac41cf8461ca4a435..67b46c2950728e9e7691fccea44d9ab9656ed54f 100644 (file)
--- a/arch/metag/mm/numa.c
+++ b/arch/metag/mm/numa.c
@@ -42,7 +42,8 @@ void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end)
        memblock_add(start, end - start);
 
        memblock_set_node(PFN_PHYS(start_pfn),
-                         PFN_PHYS(end_pfn - start_pfn), nid);
+                         PFN_PHYS(end_pfn - start_pfn),
+                         &memblock.memory, nid);
 
        /* Node-local pgdat */
        pgdat_paddr = memblock_alloc_base(sizeof(struct pglist_data),