From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756060Ab0C2Cve (ORCPT ); Sun, 28 Mar 2010 22:51:34 -0400 Received: from acsinet12.oracle.com ([141.146.126.234]:43253 "EHLO acsinet12.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755839Ab0C2Cqd (ORCPT ); Sun, 28 Mar 2010 22:46:33 -0400 From: Yinghai Lu To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , David Miller , Benjamin Herrenschmidt , Linus Torvalds Cc: Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Yinghai Lu Subject: [PATCH 15/31] lmb: Add find_lmb_area_node() Date: Sun, 28 Mar 2010 19:43:08 -0700 Message-Id: <1269830604-26214-16-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1269830604-26214-1-git-send-email-yinghai@kernel.org> References: <1269830604-26214-1-git-send-email-yinghai@kernel.org> X-Source-IP: acsmt354.oracle.com [141.146.40.154] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090205.4BB01465.002F,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It can be used to find NODE_DATA for numa. Need to make sure early_node_map[] is filled before it is called Signed-off-by: Yinghai Lu --- include/linux/lmb.h | 1 + mm/lmb.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index 143f97d..019520a 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h @@ -91,6 +91,7 @@ u64 __find_lmb_area(u64 ei_start, u64 ei_last, u64 start, u64 end, u64 size, u64 align); u64 find_lmb_area(u64 start, u64 end, u64 size, u64 align); u64 find_lmb_area_size(u64 start, u64 *sizep, u64 align); +u64 find_lmb_area_node(int nid, u64 start, u64 end, u64 size, u64 align); u64 get_max_mapped(void); void lmb_to_bootmem(u64 start, u64 end); diff --git a/mm/lmb.c b/mm/lmb.c index 7e3c2c1..addfcb1 100644 --- a/mm/lmb.c +++ b/mm/lmb.c @@ -913,6 +913,21 @@ u64 __init find_lmb_area_size(u64 start, u64 *sizep, u64 align) } /* + * Need to call this function after lmb_register_active_regions, + * so early_node_map[] is filled already. + */ +u64 __init find_lmb_area_node(int nid, u64 start, u64 end, u64 size, u64 align) +{ + u64 addr; + addr = find_memory_core_early(nid, size, align, start, end); + if (addr != -1ULL) + return addr; + + /* Fallback, should already have start end within node range */ + return find_lmb_area(start, end, size, align); +} + +/* * Finds an active region in the address range from start_pfn to last_pfn and * returns its range in ei_startpfn and ei_endpfn for the lmb entry. */ -- 1.6.4.2