The patch titled Subject: mm-make-alloc_node_mem_map-a-voidcall-if-we-dont-have-config_flat_node_mem_map-fix has been added to the -mm tree. Its filename is mm-make-alloc_node_mem_map-a-voidcall-if-we-dont-have-config_flat_node_mem_map-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-make-alloc_node_mem_map-a-voidcall-if-we-dont-have-config_flat_node_mem_map-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-make-alloc_node_mem_map-a-voidcall-if-we-dont-have-config_flat_node_mem_map-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: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-make-alloc_node_mem_map-a-voidcall-if-we-dont-have-config_flat_node_mem_map-fix clean up the printk while we're there Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxx> Cc: Oscar Salvador <osalvador@xxxxxxxxxxxxxxxxxx> Cc: Vlastimil Babka <vbabka@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/page_alloc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN mm/page_alloc.c~mm-make-alloc_node_mem_map-a-voidcall-if-we-dont-have-config_flat_node_mem_map-fix mm/page_alloc.c --- a/mm/page_alloc.c~mm-make-alloc_node_mem_map-a-voidcall-if-we-dont-have-config_flat_node_mem_map-fix +++ a/mm/page_alloc.c @@ -6178,9 +6178,9 @@ static void __ref alloc_node_mem_map(str pgdat->node_id); pgdat->node_mem_map = map + offset; } - printk(KERN_DEBUG "alloc_node_mem_map: node %d, pgdat %08lx, node_mem_map %08lx\n", - pgdat->node_id, (unsigned long)pgdat, - (unsigned long)pgdat->node_mem_map); + pr_debug("%s: node %d, pgdat %08lx, node_mem_map %08lx\n", + __func__, pgdat->node_id, (unsigned long)pgdat, + (unsigned long)pgdat->node_mem_map); #ifndef CONFIG_NEED_MULTIPLE_NODES /* * With no DISCONTIG, the global mem_map is just set as node 0's _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are i-need-old-gcc.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch mm.patch slab-slub-slob-convert-slab_flags_t-to-32-bit-fix.patch include-linux-sched-mmh-uninline-mmdrop_async-etc.patch mm-swap-skip-swapcache-only-if-swapped-page-has-no-other-reference-checkpatch-fixes.patch mm-drop-migrate-type-checks-from-has_unmovable_pages-fix.patch mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix.patch mm-swap-fix-race-conditions-in-swap_slots-cache-init-fix-fix.patch f2fs-simplify-page-iteration-loops-fix.patch mm-consolidate-page-table-accounting-fix-fix.patch mm-stop-zeroing-memory-during-allocation-in-vmemmap-fix.patch mm-batch-radix-tree-operations-when-truncating-pages-fix-fix.patch mm-simplify-nodemask-printing-fix.patch mm-make-alloc_node_mem_map-a-voidcall-if-we-dont-have-config_flat_node_mem_map-fix.patch support-resetting-warn_once-checkpatch-fixes.patch support-resetting-warn_once-for-all-architectures-v2-fix.patch support-resetting-warn_once-for-all-architectures-v2-fix-fix.patch support-resetting-warn_once-for-all-architectures-v2-fix-fix-fix.patch kernel-reboot-add-devm_register_reboot_notifier-fix.patch watchdog-core-make-use-of-devm_register_reboot_notifier-fix.patch sysvipc-unteach-ids-next_id-for-checkpoint_restore-checkpatch-fixes.patch sysvipc-make-get_maxid-o1-again-checkpatch-fixes.patch linux-next-rejects.patch linux-next-git-rejects.patch tools-objtool-makefile-dont-assume-sync-checksh-is-executable.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.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