The patch titled Subject: mm/memblock.c: add debug output for memblock_add() has been removed from the -mm tree. Its filename was mm-memblock-add-debug-output-for-the-memblock_add.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Alexander Kuleshov <kuleshovmail@xxxxxxxxx> Subject: mm/memblock.c: add debug output for memblock_add() memblock_reserve() calls memblock_reserve_region() which prints debugging information if 'memblock=debug' was passed on the command line. This patch adds the same behaviour, but for memblock_add function(). [akpm@xxxxxxxxxxxxxxxxxxxx: s/memblock_memory/memblock_add/ in message] Signed-off-by: Alexander Kuleshov <kuleshovmail@xxxxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Cc: Philipp Hachtmann <phacht@xxxxxxxxxxxxxxxxxx> Cc: Fabian Frederick <fabf@xxxxxxxxx> Cc: Catalin Marinas <catalin.marinas@xxxxxxx> Cc: Emil Medve <Emilian.Medve@xxxxxxxxxxxxx> Cc: Akinobu Mita <akinobu.mita@xxxxxxxxx> Cc: Tang Chen <tangchen@xxxxxxxxxxxxxx> Cc: Tony Luck <tony.luck@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memblock.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff -puN mm/memblock.c~mm-memblock-add-debug-output-for-the-memblock_add mm/memblock.c --- a/mm/memblock.c~mm-memblock-add-debug-output-for-the-memblock_add +++ a/mm/memblock.c @@ -580,10 +580,24 @@ int __init_memblock memblock_add_node(ph return memblock_add_range(&memblock.memory, base, size, nid, 0); } +static int __init_memblock memblock_add_region(phys_addr_t base, + phys_addr_t size, + int nid, + unsigned long flags) +{ + struct memblock_type *_rgn = &memblock.memory; + + memblock_dbg("memblock_add: [%#016llx-%#016llx] flags %#02lx %pF\n", + (unsigned long long)base, + (unsigned long long)base + size - 1, + flags, (void *)_RET_IP_); + + return memblock_add_range(_rgn, base, size, nid, flags); +} + int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size) { - return memblock_add_range(&memblock.memory, base, size, - MAX_NUMNODES, 0); + return memblock_add_region(base, size, MAX_NUMNODES, 0); } /** _ Patches currently in -mm which might be from kuleshovmail@xxxxxxxxx are origin.patch fs-fat-remove-unnecessary-defintion.patch fs-fat-remove-unnecessary-includes.patch fs-fat-remove-unnecessary-includes-fix.patch fs-fat-remove-unnecessary-includes-fix-2.patch fs-fat-comment-fix-fat_bits-can-be-also-32.patch linux-next.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