Subject: [folded-merged] memblock-make-memblock_set_node-support-different-memblock_type-fix.patch removed from -mm tree
To: sfr@xxxxxxxxxxxxxxxx,tangchen@xxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 21 Jan 2014 15:31:24 -0800
The patch titled
Subject: memblock-make-memblock_set_node-support-different-memblock_type-fix
has been removed from the -mm tree. Its filename was
memblock-make-memblock_set_node-support-different-memblock_type-fix.patch
This patch was dropped because it was folded into memblock-make-memblock_set_node-support-different-memblock_type.patch
------------------------------------------------------
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Subject: memblock-make-memblock_set_node-support-different-memblock_type-fix
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 us=
e 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.
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Tang Chen <tangchen@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/powerpc/mm/mem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN arch/powerpc/mm/mem.c~memblock-make-memblock_set_node-support-different-memblock_type-fix arch/powerpc/mm/mem.c
--- a/arch/powerpc/mm/mem.c~memblock-make-memblock_set_node-support-different-memblock_type-fix
+++ a/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.
_
Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are
origin.patch
memblock-make-memblock_set_node-support-different-memblock_type.patch
mm-memblock-add-memblock-memory-allocation-apis-fix-4.patch
x86-mm-memblock-switch-to-use-numa_no_node.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
