All _core functions only need the bootmem data, not the node descriptor. Adjust the two functions that take a node descriptor unneededly. Signed-off-by: Johannes Weiner --- mm/bootmem.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) Index: tree-linus/mm/bootmem.c =================================================================== --- tree-linus.orig/mm/bootmem.c +++ tree-linus/mm/bootmem.c @@ -85,10 +85,9 @@ static unsigned long __init get_mapsize( /* * Called once to set up the allocator itself. */ -static unsigned long __init init_bootmem_core(pg_data_t *pgdat, +static unsigned long __init init_bootmem_core(bootmem_data_t *bdata, unsigned long mapstart, unsigned long start, unsigned long end) { - bootmem_data_t *bdata = pgdat->bdata; unsigned long mapsize; bdata->node_bootmem_map = phys_to_virt(PFN_PHYS(mapstart)); @@ -314,11 +313,10 @@ found: return ret; } -static unsigned long __init free_all_bootmem_core(pg_data_t *pgdat) +static unsigned long __init free_all_bootmem_core(bootmem_data_t *bdata) { struct page *page; unsigned long pfn; - bootmem_data_t *bdata = pgdat->bdata; unsigned long i, count, total = 0; unsigned long idx; unsigned long *map; @@ -384,7 +382,7 @@ static unsigned long __init free_all_boo unsigned long __init init_bootmem_node(pg_data_t *pgdat, unsigned long freepfn, unsigned long startpfn, unsigned long endpfn) { - return init_bootmem_core(pgdat, freepfn, startpfn, endpfn); + return init_bootmem_core(pgdat->bdata, freepfn, startpfn, endpfn); } void __init reserve_bootmem_node(pg_data_t *pgdat, unsigned long physaddr, @@ -401,14 +399,14 @@ void __init free_bootmem_node(pg_data_t unsigned long __init free_all_bootmem_node(pg_data_t *pgdat) { - return free_all_bootmem_core(pgdat); + return free_all_bootmem_core(pgdat->bdata); } unsigned long __init init_bootmem(unsigned long start, unsigned long pages) { max_low_pfn = pages; min_low_pfn = start; - return init_bootmem_core(NODE_DATA(0), start, 0, pages); + return init_bootmem_core(NODE_DATA(0)->bdata, start, 0, pages); } #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE @@ -451,7 +449,7 @@ void __init free_bootmem(unsigned long a unsigned long __init free_all_bootmem(void) { - return free_all_bootmem_core(NODE_DATA(0)); + return free_all_bootmem_core(NODE_DATA(0)->bdata); } void * __init __alloc_bootmem_nopanic(unsigned long size, unsigned long align, -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/