Subject: + memblock-make-memblock_set_node-support-different-memblock_type-fix.patch added to -mm tree
To: sfr@xxxxxxxxxxxxxxxx,tangchen@xxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 18 Dec 2013 13:22:27 -0800
The patch titled
Subject: memblock-make-memblock_set_node-support-different-memblock_type-fix
has been added to the -mm tree. Its filename is
memblock-make-memblock_set_node-support-different-memblock_type-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/memblock-make-memblock_set_node-support-different-memblock_type-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/memblock-make-memblock_set_node-support-different-memblock_type-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
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
memblock-make-memblock_set_node-support-different-memblock_type-fix.patch
rtc-add-hym8563-rtc-driver-fix.patch
linux-next.patch
kernel-forkc-export-kernel_thread-to-modules.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
