From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yinghai Lu Subject: [PATCH 26/37] lmb: Move __alloc_memory_core_early() to nobootmem.c Date: Fri, 14 May 2010 12:45:52 -0700 Message-ID: <1273866363-14249-27-git-send-email-yinghai@kernel.org> References: <1273866363-14249-1-git-send-email-yinghai@kernel.org> Return-path: Received: from rcsinet10.oracle.com ([148.87.113.121]:17292 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752342Ab0ENTtz (ORCPT ); Fri, 14 May 2010 15:49:55 -0400 In-Reply-To: <1273866363-14249-1-git-send-email-yinghai@kernel.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , David Miller , Be Cc: Linus Torvalds , Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu We can remove #ifdef in mm/page_alloc.c and change that function to static Signed-off-by: Yinghai Lu --- include/linux/mm.h | 2 -- mm/nobootmem.c | 21 +++++++++++++++++++++ mm/page_alloc.c | 24 ------------------------ 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 7774e1d..2a14361 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1161,8 +1161,6 @@ int add_from_early_node_map(struct range *range, int az, int nr_range, int nid); u64 __init find_memory_core_early(int nid, u64 size, u64 align, u64 goal, u64 limit); -void *__alloc_memory_core_early(int nodeid, u64 size, u64 align, - u64 goal, u64 limit); typedef int (*work_fn_t)(unsigned long, unsigned long, void *); extern void work_with_active_regions(int nid, work_fn_t work_fn, void *data); extern void sparse_memory_present_with_active_regions(int nid); diff --git a/mm/nobootmem.c b/mm/nobootmem.c index abaec96..e3cbde7 100644 --- a/mm/nobootmem.c +++ b/mm/nobootmem.c @@ -40,6 +40,27 @@ unsigned long max_pfn; unsigned long saved_max_pfn; #endif +static void * __init __alloc_memory_core_early(int nid, u64 size, u64 align, + u64 goal, u64 limit) +{ + void *ptr; + + u64 addr; + + if (limit > lmb.current_limit) + limit = lmb.current_limit; + + addr = find_memory_core_early(nid, size, align, goal, limit); + + if (addr == LMB_ERROR) + return NULL; + + ptr = phys_to_virt(addr); + memset(ptr, 0, size); + lmb_reserve_area(addr, addr + size, "BOOTMEM"); + return ptr; +} + /* * free_bootmem_late - free bootmem pages directly to page allocator * @addr: starting address of the range diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 704b26f..7a07e12 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3437,30 +3437,6 @@ int __init add_from_early_node_map(struct range *range, int az, return nr_range; } -#ifdef CONFIG_NO_BOOTMEM -void * __init __alloc_memory_core_early(int nid, u64 size, u64 align, - u64 goal, u64 limit) -{ - void *ptr; - - u64 addr; - - if (limit > lmb.current_limit) - limit = lmb.current_limit; - - addr = find_memory_core_early(nid, size, align, goal, limit); - - if (addr == LMB_ERROR) - return NULL; - - ptr = phys_to_virt(addr); - memset(ptr, 0, size); - lmb_reserve_area(addr, addr + size, "BOOTMEM"); - return ptr; -} -#endif - - void __init work_with_active_regions(int nid, work_fn_t work_fn, void *data) { int i; -- 1.6.4.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rcsinet10.oracle.com ([148.87.113.121]:17292 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752342Ab0ENTtz (ORCPT ); Fri, 14 May 2010 15:49:55 -0400 From: Yinghai Lu Subject: [PATCH 26/37] lmb: Move __alloc_memory_core_early() to nobootmem.c Date: Fri, 14 May 2010 12:45:52 -0700 Message-ID: <1273866363-14249-27-git-send-email-yinghai@kernel.org> In-Reply-To: <1273866363-14249-1-git-send-email-yinghai@kernel.org> References: <1273866363-14249-1-git-send-email-yinghai@kernel.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , David Miller , Benjamin Herrenschmidt Cc: Linus Torvalds , Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu Message-ID: <20100514194552.lT9qT9xcKJ82zGoyDAJlXArF4F479q8Umxe9bGva40g@z> We can remove #ifdef in mm/page_alloc.c and change that function to static Signed-off-by: Yinghai Lu --- include/linux/mm.h | 2 -- mm/nobootmem.c | 21 +++++++++++++++++++++ mm/page_alloc.c | 24 ------------------------ 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 7774e1d..2a14361 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1161,8 +1161,6 @@ int add_from_early_node_map(struct range *range, int az, int nr_range, int nid); u64 __init find_memory_core_early(int nid, u64 size, u64 align, u64 goal, u64 limit); -void *__alloc_memory_core_early(int nodeid, u64 size, u64 align, - u64 goal, u64 limit); typedef int (*work_fn_t)(unsigned long, unsigned long, void *); extern void work_with_active_regions(int nid, work_fn_t work_fn, void *data); extern void sparse_memory_present_with_active_regions(int nid); diff --git a/mm/nobootmem.c b/mm/nobootmem.c index abaec96..e3cbde7 100644 --- a/mm/nobootmem.c +++ b/mm/nobootmem.c @@ -40,6 +40,27 @@ unsigned long max_pfn; unsigned long saved_max_pfn; #endif +static void * __init __alloc_memory_core_early(int nid, u64 size, u64 align, + u64 goal, u64 limit) +{ + void *ptr; + + u64 addr; + + if (limit > lmb.current_limit) + limit = lmb.current_limit; + + addr = find_memory_core_early(nid, size, align, goal, limit); + + if (addr == LMB_ERROR) + return NULL; + + ptr = phys_to_virt(addr); + memset(ptr, 0, size); + lmb_reserve_area(addr, addr + size, "BOOTMEM"); + return ptr; +} + /* * free_bootmem_late - free bootmem pages directly to page allocator * @addr: starting address of the range diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 704b26f..7a07e12 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3437,30 +3437,6 @@ int __init add_from_early_node_map(struct range *range, int az, return nr_range; } -#ifdef CONFIG_NO_BOOTMEM -void * __init __alloc_memory_core_early(int nid, u64 size, u64 align, - u64 goal, u64 limit) -{ - void *ptr; - - u64 addr; - - if (limit > lmb.current_limit) - limit = lmb.current_limit; - - addr = find_memory_core_early(nid, size, align, goal, limit); - - if (addr == LMB_ERROR) - return NULL; - - ptr = phys_to_virt(addr); - memset(ptr, 0, size); - lmb_reserve_area(addr, addr + size, "BOOTMEM"); - return ptr; -} -#endif - - void __init work_with_active_regions(int nid, work_fn_t work_fn, void *data) { int i; -- 1.6.4.2