From: Andy Whitcroft The vmemmap and non-vmemmap implementations of sparse_early_mem_map_alloc() share a fair amount of code. Refactor this into a common wrapper, pulling the differences out to sparse_early_mem_map_populate(). This reduces depandancies between SPARSMEM and SPARSEMEM_VMEMMAP simplifying separation. Signed-off-by: Andy Whitcroft Cc: Christoph Lameter Cc: Dave Hansen Signed-off-by: Andrew Morton --- mm/sparse.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff -puN mm/sparse.c~generic-virtual-memmap-support-for-sparsemem-simplify-initialisation-code-and-reduce-duplication mm/sparse.c --- a/mm/sparse.c~generic-virtual-memmap-support-for-sparsemem-simplify-initialisation-code-and-reduce-duplication +++ a/mm/sparse.c @@ -387,33 +387,23 @@ int __meminit vmemmap_populate(struct pa } #endif /* !CONFIG_ARCH_POPULATES_SPARSEMEM_VMEMMAP */ -static struct page * __init sparse_early_mem_map_alloc(unsigned long pnum) +static struct page __init *sparse_early_mem_map_populate(unsigned long pnum, + int nid) { - struct page *map; - struct mem_section *ms = __nr_to_section(pnum); - int nid = sparse_early_nid(ms); - int error; - - map = pfn_to_page(pnum * PAGES_PER_SECTION); - error = vmemmap_populate(map, PAGES_PER_SECTION, nid); - if (error) { - printk(KERN_ERR "%s: allocation failed. Error=%d\n", - __FUNCTION__, error); - printk(KERN_ERR "%s: virtual memory map backing failed " - "some memory will not be available.\n", __FUNCTION__); - ms->section_mem_map = 0; + struct page *map = pfn_to_page(pnum * PAGES_PER_SECTION); + int error = vmemmap_populate(map, PAGES_PER_SECTION, nid); + if (error) return NULL; - } + return map; } #else /* CONFIG_SPARSEMEM_VMEMMAP */ -static struct page __init *sparse_early_mem_map_alloc(unsigned long pnum) +static struct page __init *sparse_early_mem_map_populate(unsigned long pnum, + int nid) { struct page *map; - struct mem_section *ms = __nr_to_section(pnum); - int nid = sparse_early_nid(ms); map = alloc_remap(nid, sizeof(struct page) * PAGES_PER_SECTION); if (map) @@ -426,14 +416,25 @@ static struct page __init *sparse_early_ map = alloc_bootmem_node(NODE_DATA(nid), sizeof(struct page) * PAGES_PER_SECTION); + return map; +} +#endif /* !CONFIG_SPARSEMEM_VMEMMAP */ + +struct page __init *sparse_early_mem_map_alloc(unsigned long pnum) +{ + struct page *map; + struct mem_section *ms = __nr_to_section(pnum); + int nid = sparse_early_nid(ms); + + map = sparse_early_mem_map_populate(pnum, nid); if (map) return map; - printk(KERN_WARNING "%s: allocation failed\n", __FUNCTION__); + printk(KERN_ERR "%s: sparsemem memory map backing failed " + "some memory will not be available.\n", __FUNCTION__); ms->section_mem_map = 0; return NULL; } -#endif /* !CONFIG_SPARSEMEM_VMEMMAP */ /* * Allocate the accumulated non-linear sections, allocate a mem_map _