Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mm: unexport __alloc_bootmem_core()

This function has no external callers, so unexport it. Also fix its naming
inconsistency.

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Johannes Weiner and committed by
Linus Torvalds
ffc6421f 8ae04463

+12 -17
-5
include/linux/bootmem.h
··· 56 56 unsigned long size, 57 57 unsigned long align, 58 58 unsigned long goal); 59 - extern void *__alloc_bootmem_core(struct bootmem_data *bdata, 60 - unsigned long size, 61 - unsigned long align, 62 - unsigned long goal, 63 - unsigned long limit); 64 59 65 60 /* 66 61 * flags for reserve_bootmem (also if CONFIG_HAVE_ARCH_BOOTMEM_NODE,
+12 -12
mm/bootmem.c
··· 234 234 * 235 235 * NOTE: This function is _not_ reentrant. 236 236 */ 237 - void * __init 238 - __alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size, 239 - unsigned long align, unsigned long goal, unsigned long limit) 237 + static void * __init 238 + alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size, 239 + unsigned long align, unsigned long goal, unsigned long limit) 240 240 { 241 241 unsigned long areasize, preferred; 242 242 unsigned long i, start = 0, incr, eidx, end_pfn; ··· 245 245 void *node_bootmem_map; 246 246 247 247 if (!size) { 248 - printk("__alloc_bootmem_core(): zero-sized request\n"); 248 + printk("alloc_bootmem_core(): zero-sized request\n"); 249 249 BUG(); 250 250 } 251 251 BUG_ON(align & (align-1)); ··· 512 512 void *ptr; 513 513 514 514 list_for_each_entry(bdata, &bdata_list, list) { 515 - ptr = __alloc_bootmem_core(bdata, size, align, goal, 0); 515 + ptr = alloc_bootmem_core(bdata, size, align, goal, 0); 516 516 if (ptr) 517 517 return ptr; 518 518 } ··· 540 540 { 541 541 void *ptr; 542 542 543 - ptr = __alloc_bootmem_core(pgdat->bdata, size, align, goal, 0); 543 + ptr = alloc_bootmem_core(pgdat->bdata, size, align, goal, 0); 544 544 if (ptr) 545 545 return ptr; 546 546 ··· 559 559 goal = PFN_PHYS(pfn); 560 560 limit = PFN_PHYS(section_nr_to_pfn(section_nr + 1)) - 1; 561 561 pgdat = NODE_DATA(early_pfn_to_nid(pfn)); 562 - ptr = __alloc_bootmem_core(pgdat->bdata, size, SMP_CACHE_BYTES, goal, 563 - limit); 562 + ptr = alloc_bootmem_core(pgdat->bdata, size, SMP_CACHE_BYTES, goal, 563 + limit); 564 564 565 565 if (!ptr) 566 566 return NULL; ··· 589 589 void *ptr; 590 590 591 591 list_for_each_entry(bdata, &bdata_list, list) { 592 - ptr = __alloc_bootmem_core(bdata, size, align, goal, 593 - ARCH_LOW_ADDRESS_LIMIT); 592 + ptr = alloc_bootmem_core(bdata, size, align, goal, 593 + ARCH_LOW_ADDRESS_LIMIT); 594 594 if (ptr) 595 595 return ptr; 596 596 } ··· 606 606 void * __init __alloc_bootmem_low_node(pg_data_t *pgdat, unsigned long size, 607 607 unsigned long align, unsigned long goal) 608 608 { 609 - return __alloc_bootmem_core(pgdat->bdata, size, align, goal, 610 - ARCH_LOW_ADDRESS_LIMIT); 609 + return alloc_bootmem_core(pgdat->bdata, size, align, goal, 610 + ARCH_LOW_ADDRESS_LIMIT); 611 611 }