On 05/13/2010 07:29 PM, Benjamin Herrenschmidt wrote: > On Thu, 2010-05-13 at 17:19 -0700, Yinghai Lu wrote: >> According to node range in early_node_map[] with __lmb_find_area >> to find free range. >> >> Will be used by lmb_find_area_node() >> >> lmb_find_area_node will be used to find right buffer for NODE_DATA > > The prototype for this has nothing to do in lmb.h under that name at > least. it is calling __lmb_find_area() but it need to use early_node_map[], so put this function here > > Cheers, > Ben. > >> Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx> >> --- >> include/linux/mm.h | 2 ++ >> mm/page_alloc.c | 29 +++++++++++++++++++++++++++++ >> 2 files changed, 31 insertions(+), 0 deletions(-) >> >> diff --git a/include/linux/mm.h b/include/linux/mm.h >> index fb19bb9..7774e1d 100644 >> --- a/include/linux/mm.h >> +++ b/include/linux/mm.h >> @@ -1159,6 +1159,8 @@ extern void free_bootmem_with_active_regions(int nid, >> unsigned long max_low_pfn); >> 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 *); >> diff --git a/mm/page_alloc.c b/mm/page_alloc.c >> index d03c946..72afd94 100644 >> --- a/mm/page_alloc.c >> +++ b/mm/page_alloc.c >> @@ -21,6 +21,7 @@ >> #include <linux/pagemap.h> >> #include <linux/jiffies.h> >> #include <linux/bootmem.h> >> +#include <linux/lmb.h> >> #include <linux/compiler.h> >> #include <linux/kernel.h> >> #include <linux/kmemcheck.h> >> @@ -3393,6 +3394,34 @@ void __init free_bootmem_with_active_regions(int nid, >> } >> } >> >> +#ifdef CONFIG_HAVE_LMB >> +u64 __init find_memory_core_early(int nid, u64 size, u64 align, >> + u64 goal, u64 limit) >> +{ >> + int i; >> + >> + /* Need to go over early_node_map to find out good range for node */ >> + for_each_active_range_index_in_nid(i, nid) { >> + u64 addr; >> + u64 ei_start, ei_last; >> + >> + ei_last = early_node_map[i].end_pfn; >> + ei_last <<= PAGE_SHIFT; >> + ei_start = early_node_map[i].start_pfn; >> + ei_start <<= PAGE_SHIFT; >> + addr = __lmb_find_area(ei_start, ei_last, >> + goal, limit, size, align); >> + >> + if (addr == LMB_ERROR) >> + continue; >> + >> + return addr; >> + } >> + >> + return -1ULL; >> +} >> +#endif >> + >> int __init add_from_early_node_map(struct range *range, int az, >> int nr_range, int nid) >> { > -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html