[PATCH 2/5] mm/memblock: rename get_allocated_memblock_reserved_regions_info()
From: Wanpeng Li <hidden>
Date: 2012-08-24 14:34:38
Also in:
lkml
Subsystem:
memblock and memory management initialization, memory management, the rest · Maintainers:
Mike Rapoport, Andrew Morton, Linus Torvalds
From: Wanpeng Li <redacted> Rename get_allocated_memblock_reserved_regions_info() to memblock_reserved_regions_info() so that the function name looks more short and has prefix "memblock". Signed-off-by: Wanpeng Li <redacted> --- include/linux/memblock.h | 2 +- mm/memblock.c | 2 +- mm/nobootmem.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 569d67d..ab7b887 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h@@ -50,7 +50,7 @@ phys_addr_t memblock_find_in_range_node(phys_addr_t start, phys_addr_t end, phys_addr_t size, phys_addr_t align, int nid); phys_addr_t memblock_find_in_range(phys_addr_t start, phys_addr_t end, phys_addr_t size, phys_addr_t align); -phys_addr_t get_allocated_memblock_reserved_regions_info(phys_addr_t *addr); +phys_addr_t memblock_reserved_regions_info(phys_addr_t *addr); void memblock_allow_resize(void); int memblock_add_node(phys_addr_t base, phys_addr_t size, int nid); int memblock_add(phys_addr_t base, phys_addr_t size);
diff --git a/mm/memblock.c b/mm/memblock.c
index c1fbb12..2feff8d 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c@@ -160,7 +160,7 @@ static void __init_memblock memblock_remove_region(struct memblock_type *type, u } } -phys_addr_t __init_memblock get_allocated_memblock_reserved_regions_info( +phys_addr_t __init_memblock memblock_reserved_regions_info( phys_addr_t *addr) { if (memblock.reserved.regions == memblock_reserved_init_regions)
diff --git a/mm/nobootmem.c b/mm/nobootmem.c
index bd82f6b..7e95953 100644
--- a/mm/nobootmem.c
+++ b/mm/nobootmem.c@@ -130,7 +130,7 @@ unsigned long __init free_low_memory_core_early(int nodeid) count += __free_memory_core(start, end); /* free range that is used for reserved array if we allocate it */ - size = get_allocated_memblock_reserved_regions_info(&start); + size = memblock_reserved_regions_info(&start); if (size) count += __free_memory_core(start, start + size);
--
1.7.5.4
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>