Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffc6421f authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm: unexport __alloc_bootmem_core() 



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

Signed-off-by: default avatarJohannes 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8ae04463

include/linux/bootmem.h

+0 −5
Original line number Diff line number Diff line
@@ -56,11 +56,6 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat, 
				      unsigned long size,

				      unsigned long align,

				      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,

mm/bootmem.c

+12 −12
Original line number Diff line number Diff line
@@ -234,8 +234,8 @@ static void __init free_bootmem_core(bootmem_data_t *bdata, unsigned long addr, 
 *

 * NOTE:  This function is _not_ reentrant.

 */

void * __init

__alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size,

static void * __init

alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size,

		unsigned long align, unsigned long goal, unsigned long limit)

{

	unsigned long areasize, preferred;
@@ -245,7 +245,7 @@ __alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size, 
	void *node_bootmem_map;



	if (!size) {

		printk("__alloc_bootmem_core(): zero-sized request\n");

		printk("alloc_bootmem_core(): zero-sized request\n");

		BUG();

	}

	BUG_ON(align & (align-1));
@@ -512,7 +512,7 @@ void * __init __alloc_bootmem_nopanic(unsigned long size, unsigned long align, 
	void *ptr;



	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)

			return ptr;

	}
@@ -540,7 +540,7 @@ void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size, 
{

	void *ptr;



	ptr = __alloc_bootmem_core(pgdat->bdata, size, align, goal, 0);

	ptr = alloc_bootmem_core(pgdat->bdata, size, align, goal, 0);

	if (ptr)

		return ptr;
@@ -559,7 +559,7 @@ void * __init alloc_bootmem_section(unsigned long size, 
	goal = PFN_PHYS(pfn);

	limit = PFN_PHYS(section_nr_to_pfn(section_nr + 1)) - 1;

	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);



	if (!ptr)
@@ -589,7 +589,7 @@ void * __init __alloc_bootmem_low(unsigned long size, unsigned long align, 
	void *ptr;



	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);

		if (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,

				       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);

}