mm/memblock.c: rename local variable of memblock_type to `type'

A small cleanup.  Seems in e3239ff9 ("memblock: Rename memblock_region to
memblock_type and memblock_property to memblock_region") this one was
missed.

Signed-off-by: Baoquan He <bhe@redhat.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Baoquan He 2015-04-14 15:44:48 -07:00 committed by Linus Torvalds
parent acc3c8d15e
commit 7fc825b456

View File

@ -699,14 +699,14 @@ static int __init_memblock memblock_reserve_region(phys_addr_t base,
int nid, int nid,
unsigned long flags) unsigned long flags)
{ {
struct memblock_type *_rgn = &memblock.reserved; struct memblock_type *type = &memblock.reserved;
memblock_dbg("memblock_reserve: [%#016llx-%#016llx] flags %#02lx %pF\n", memblock_dbg("memblock_reserve: [%#016llx-%#016llx] flags %#02lx %pF\n",
(unsigned long long)base, (unsigned long long)base,
(unsigned long long)base + size - 1, (unsigned long long)base + size - 1,
flags, (void *)_RET_IP_); flags, (void *)_RET_IP_);
return memblock_add_range(_rgn, base, size, nid, flags); return memblock_add_range(type, base, size, nid, flags);
} }
int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size) int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size)