memblock, x86: Replace memblock_x86_reserve/free_range() with generic ones
Other than sanity check and debug message, the x86 specific version of memblock reserve/free functions are simple wrappers around the generic versions - memblock_reserve/free(). This patch adds debug messages with caller identification to the generic versions and replaces x86 specific ones and kills them. arch/x86/include/asm/memblock.h and arch/x86/mm/memblock.c are empty after this change and removed. Signed-off-by: Tejun Heo <tj@kernel.org> Link: http://lkml.kernel.org/r/1310462166-31469-14-git-send-email-tj@kernel.org Cc: Yinghai Lu <yinghai@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
committed by
H. Peter Anvin
parent
c378ddd53f
commit
24aa07882b
@@ -449,6 +449,9 @@ long __init_memblock memblock_remove(phys_addr_t base, phys_addr_t size)
|
||||
|
||||
long __init_memblock memblock_free(phys_addr_t base, phys_addr_t size)
|
||||
{
|
||||
memblock_dbg(" memblock_free: [%#016llx-%#016llx] %pF\n",
|
||||
base, base + size, (void *)_RET_IP_);
|
||||
|
||||
return __memblock_remove(&memblock.reserved, base, size);
|
||||
}
|
||||
|
||||
@@ -456,6 +459,8 @@ long __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size)
|
||||
{
|
||||
struct memblock_type *_rgn = &memblock.reserved;
|
||||
|
||||
memblock_dbg("memblock_reserve: [%#016llx-%#016llx] %pF\n",
|
||||
base, base + size, (void *)_RET_IP_);
|
||||
BUG_ON(0 == size);
|
||||
|
||||
return memblock_add_region(_rgn, base, size);
|
||||
|
Reference in New Issue
Block a user