Commit 6a4055bc authored Apr 15, 2015 by Alexander Kuleshov Committed by Linus Torvalds Apr 15, 2015

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@linux-foundation.org: s/memblock_memory/memblock_add/ in message]
Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Philipp Hachtmann <phacht@linux.vnet.ibm.com>
Cc: Fabian Frederick <fabf@skynet.be>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Emil Medve <Emilian.Medve@freescale.com>
Cc: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 7e1f049e

mm/memblock.c

+16 −2

Original line number	Original line	Diff line number	Diff line
	@@ -580,10 +580,24 @@ int __init_memblock memblock_add_node(phys_addr_t base, phys_addr_t size,
	return memblock_add_range(&memblock.memory, base, size, nid, 0);		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)		int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size)
	{		{
	return memblock_add_range(&memblock.memory, base, size,		return memblock_add_region(base, size, MAX_NUMNODES, 0);
	MAX_NUMNODES, 0);
	}		}

	/**		/**

Admin message