From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx137.postini.com [74.125.245.137]) by kanga.kvack.org (Postfix) with SMTP id F1F276B0044 for ; Fri, 24 Aug 2012 10:34:34 -0400 (EDT) Received: from /spool/local by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 25 Aug 2012 00:33:44 +1000 Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q7OEPiYj23003330 for ; Sat, 25 Aug 2012 00:25:45 +1000 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q7OEYTYf024778 for ; Sat, 25 Aug 2012 00:34:29 +1000 From: Wanpeng Li Subject: [PATCH 2/5] mm/memblock: rename get_allocated_memblock_reserved_regions_info() Date: Fri, 24 Aug 2012 22:33:37 +0800 Message-Id: <1345818820-12102-2-git-send-email-liwanp@linux.vnet.ibm.com> In-Reply-To: <1345818820-12102-1-git-send-email-liwanp@linux.vnet.ibm.com> References: <1345818820-12102-1-git-send-email-liwanp@linux.vnet.ibm.com> Sender: owner-linux-mm@kvack.org List-ID: To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, Michal Hocko , KAMEZAWA Hiroyuki , Minchan Kim , Andrew Morton , Gavin Shan , Wanpeng Li From: Wanpeng Li 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 --- 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: email@kvack.org