leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mm: unexport __alloc_bootmem_core()

Browse Source 
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>
This commit is contained in:
Johannes Weiner 2008-07-23 21:26:59 -07:00 committed by Linus Torvalds
parent 8ae0446307
commit ffc6421f07
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/bootmem.h
View File

@ -56,11 +56,6 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,
unsigned long size, unsigned long size,
unsigned long align, unsigned long align,
unsigned long goal); unsigned long goal);
extern void *__alloc_bootmem_core(struct bootmem_data *bdata,
unsigned long size,
unsigned long align,
unsigned long goal,
unsigned long limit);
/* /*
* flags for reserve_bootmem (also if CONFIG_HAVE_ARCH_BOOTMEM_NODE, * flags for reserve_bootmem (also if CONFIG_HAVE_ARCH_BOOTMEM_NODE,

24
mm/bootmem.c
View File

@ -234,9 +234,9 @@ static void __init free_bootmem_core(bootmem_data_t *bdata, unsigned long addr,
* *
* NOTE: This function is _not_ reentrant. * NOTE: This function is _not_ reentrant.
*/ */
void * __init static void * __init
__alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size, alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size,
unsigned long align, unsigned long goal, unsigned long limit) unsigned long align, unsigned long goal, unsigned long limit)
{ {
unsigned long areasize, preferred; unsigned long areasize, preferred;
unsigned long i, start = 0, incr, eidx, end_pfn; unsigned long i, start = 0, incr, eidx, end_pfn;
@ -245,7 +245,7 @@ __alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size,
void *node_bootmem_map; void *node_bootmem_map;
if (!size) { if (!size) {
printk("__alloc_bootmem_core(): zero-sized request\n"); printk("alloc_bootmem_core(): zero-sized request\n");
BUG(); BUG();
} }
BUG_ON(align & (align-1)); BUG_ON(align & (align-1));
@ -512,7 +512,7 @@ void * __init __alloc_bootmem_nopanic(unsigned long size, unsigned long align,
void *ptr; void *ptr;
list_for_each_entry(bdata, &bdata_list, list) { list_for_each_entry(bdata, &bdata_list, list) {
ptr = __alloc_bootmem_core(bdata, size, align, goal, 0); ptr = alloc_bootmem_core(bdata, size, align, goal, 0);
if (ptr) if (ptr)
return ptr; return ptr;
} }
@ -540,7 +540,7 @@ void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size,
{ {
void *ptr; void *ptr;
ptr = __alloc_bootmem_core(pgdat->bdata, size, align, goal, 0); ptr = alloc_bootmem_core(pgdat->bdata, size, align, goal, 0);
if (ptr) if (ptr)
return ptr; return ptr;
@ -559,8 +559,8 @@ void * __init alloc_bootmem_section(unsigned long size,
goal = PFN_PHYS(pfn); goal = PFN_PHYS(pfn);
limit = PFN_PHYS(section_nr_to_pfn(section_nr + 1)) - 1; limit = PFN_PHYS(section_nr_to_pfn(section_nr + 1)) - 1;
pgdat = NODE_DATA(early_pfn_to_nid(pfn)); pgdat = NODE_DATA(early_pfn_to_nid(pfn));
ptr = __alloc_bootmem_core(pgdat->bdata, size, SMP_CACHE_BYTES, goal, ptr = alloc_bootmem_core(pgdat->bdata, size, SMP_CACHE_BYTES, goal,
limit); limit);
if (!ptr) if (!ptr)
return NULL; return NULL;
@ -589,8 +589,8 @@ void * __init __alloc_bootmem_low(unsigned long size, unsigned long align,
void *ptr; void *ptr;
list_for_each_entry(bdata, &bdata_list, list) { list_for_each_entry(bdata, &bdata_list, list) {
ptr = __alloc_bootmem_core(bdata, size, align, goal, ptr = alloc_bootmem_core(bdata, size, align, goal,
ARCH_LOW_ADDRESS_LIMIT); ARCH_LOW_ADDRESS_LIMIT);
if (ptr) if (ptr)
return ptr; return ptr;
} }
@ -606,6 +606,6 @@ void * __init __alloc_bootmem_low(unsigned long size, unsigned long align,
void * __init __alloc_bootmem_low_node(pg_data_t *pgdat, unsigned long size, void * __init __alloc_bootmem_low_node(pg_data_t *pgdat, unsigned long size,
unsigned long align, unsigned long goal) unsigned long align, unsigned long goal)
{ {
return __alloc_bootmem_core(pgdat->bdata, size, align, goal, return alloc_bootmem_core(pgdat->bdata, size, align, goal,
ARCH_LOW_ADDRESS_LIMIT); ARCH_LOW_ADDRESS_LIMIT);
} }