Hi all, After merging the final tree, today's linux-next build (powerpc allnoconfig) failed like this: arch/powerpc/mm/mem.c: In function 'do_init_bootmem': arch/powerpc/mm/mem.c:212:49: error: 'memblock_memory' undeclared (first use in this function) memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock_memory, 0); ^ Caused by commit 3a543893d46a ("memblock: make memblock_set_node() support different memblock_type") from the apm-current tree. I added the following fix for today: From: Stephen Rothwell Date: Tue, 17 Dec 2013 16:38:21 +1100 Subject: [PATCH] memblock-make-memblock_set_node-support-different-memblock_type-fix Signed-off-by: Stephen Rothwell --- arch/powerpc/mm/mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 231b785b726e..8c1dd23652a1 100644 --- 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, &memblock_memory, 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. -- 1.8.5.1 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au