From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yinghai Lu Subject: [PATCH 7/8] early_res: prepare for other platform to use it Date: Wed, 24 Mar 2010 03:34:20 -0700 Message-ID: <1269426861-20903-8-git-send-email-yinghai@kernel.org> References: <1269426861-20903-1-git-send-email-yinghai@kernel.org> Return-path: Received: from acsinet12.oracle.com ([141.146.126.234]:21156 "EHLO acsinet12.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754800Ab0CXKiA (ORCPT ); Wed, 24 Mar 2010 06:38:00 -0400 In-Reply-To: <1269426861-20903-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: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu From: Yinghai Lu add weak reserver_bootmem_generic() also clean up x86 64 bit one. add include for linux/early_res.h Signed-off-by: Yinghai Lu --- arch/x86/mm/init_32.c | 5 ----- arch/x86/mm/init_64.c | 18 ------------------ mm/bootmem.c | 7 +++++++ mm/page_alloc.c | 1 + 4 files changed, 8 insertions(+), 23 deletions(-) diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index a7625d5..16001e1 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -1070,8 +1070,3 @@ void mark_rodata_ro(void) } #endif -int __init reserve_bootmem_generic(unsigned long phys, unsigned long len, - int flags) -{ - return reserve_bootmem(phys, len, flags); -} diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index dd88ef9..cc3627b 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -801,10 +801,6 @@ void mark_rodata_ro(void) int __init reserve_bootmem_generic(unsigned long phys, unsigned long len, int flags) { -#ifdef CONFIG_NUMA - int nid, next_nid; - int ret; -#endif unsigned long pfn = phys >> PAGE_SHIFT; if (pfn >= max_pfn) { @@ -820,21 +816,7 @@ int __init reserve_bootmem_generic(unsigned long phys, unsigned long len, return -EFAULT; } - /* Should check here against the e820 map to avoid double free */ -#ifdef CONFIG_NUMA - nid = phys_to_nid(phys); - next_nid = phys_to_nid(phys + len - 1); - if (nid == next_nid) - ret = reserve_bootmem_node(NODE_DATA(nid), phys, len, flags); - else - ret = reserve_bootmem(phys, len, flags); - - if (ret != 0) - return ret; - -#else reserve_bootmem(phys, len, flags); -#endif if (phys+len <= MAX_DMA_PFN*PAGE_SIZE) { dma_reserve += len / PAGE_SIZE; diff --git a/mm/bootmem.c b/mm/bootmem.c index d7c791e..760c279 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -525,6 +526,12 @@ int __init reserve_bootmem(unsigned long addr, unsigned long size, } #ifndef CONFIG_NO_BOOTMEM +int __weak __init reserve_bootmem_generic(unsigned long phys, unsigned long len, + int flags) +{ + return reserve_bootmem(phys, len, flags); +} + static unsigned long __init align_idx(struct bootmem_data *bdata, unsigned long idx, unsigned long step) { diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 04c241a..e7b1d72 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include -- 1.6.4.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from acsinet12.oracle.com ([141.146.126.234]:21156 "EHLO acsinet12.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754800Ab0CXKiA (ORCPT ); Wed, 24 Mar 2010 06:38:00 -0400 From: Yinghai Lu Subject: [PATCH 7/8] early_res: prepare for other platform to use it Date: Wed, 24 Mar 2010 03:34:20 -0700 Message-ID: <1269426861-20903-8-git-send-email-yinghai@kernel.org> In-Reply-To: <1269426861-20903-1-git-send-email-yinghai@kernel.org> References: <1269426861-20903-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 , Linus Torvalds Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu Message-ID: <20100324103420.6DPmipaz2WLC31iu50Av4Dtr_x3QorrUORqblBfkwBM@z> From: Yinghai Lu add weak reserver_bootmem_generic() also clean up x86 64 bit one. add include for linux/early_res.h Signed-off-by: Yinghai Lu --- arch/x86/mm/init_32.c | 5 ----- arch/x86/mm/init_64.c | 18 ------------------ mm/bootmem.c | 7 +++++++ mm/page_alloc.c | 1 + 4 files changed, 8 insertions(+), 23 deletions(-) diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index a7625d5..16001e1 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -1070,8 +1070,3 @@ void mark_rodata_ro(void) } #endif -int __init reserve_bootmem_generic(unsigned long phys, unsigned long len, - int flags) -{ - return reserve_bootmem(phys, len, flags); -} diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index dd88ef9..cc3627b 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -801,10 +801,6 @@ void mark_rodata_ro(void) int __init reserve_bootmem_generic(unsigned long phys, unsigned long len, int flags) { -#ifdef CONFIG_NUMA - int nid, next_nid; - int ret; -#endif unsigned long pfn = phys >> PAGE_SHIFT; if (pfn >= max_pfn) { @@ -820,21 +816,7 @@ int __init reserve_bootmem_generic(unsigned long phys, unsigned long len, return -EFAULT; } - /* Should check here against the e820 map to avoid double free */ -#ifdef CONFIG_NUMA - nid = phys_to_nid(phys); - next_nid = phys_to_nid(phys + len - 1); - if (nid == next_nid) - ret = reserve_bootmem_node(NODE_DATA(nid), phys, len, flags); - else - ret = reserve_bootmem(phys, len, flags); - - if (ret != 0) - return ret; - -#else reserve_bootmem(phys, len, flags); -#endif if (phys+len <= MAX_DMA_PFN*PAGE_SIZE) { dma_reserve += len / PAGE_SIZE; diff --git a/mm/bootmem.c b/mm/bootmem.c index d7c791e..760c279 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -525,6 +526,12 @@ int __init reserve_bootmem(unsigned long addr, unsigned long size, } #ifndef CONFIG_NO_BOOTMEM +int __weak __init reserve_bootmem_generic(unsigned long phys, unsigned long len, + int flags) +{ + return reserve_bootmem(phys, len, flags); +} + static unsigned long __init align_idx(struct bootmem_data *bdata, unsigned long idx, unsigned long step) { diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 04c241a..e7b1d72 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include -- 1.6.4.2