mm: bootmem: rename alloc_bootmem_core to alloc_bootmem_bdata
Callsites need to provide a bootmem_data_t *, make the naming more descriptive. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Tejun Heo <tj@kernel.org> Acked-by: David S. Miller <davem@davemloft.net> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Gavin Shan <shangw@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
549381e19c
commit
c6785b6bf1
1 changed files with 7 additions and 7 deletions
14
mm/bootmem.c
14
mm/bootmem.c
|
@ -468,7 +468,7 @@ static unsigned long __init align_off(struct bootmem_data *bdata,
|
|||
return ALIGN(base + off, align) - base;
|
||||
}
|
||||
|
||||
static void * __init alloc_bootmem_core(struct bootmem_data *bdata,
|
||||
static void * __init alloc_bootmem_bdata(struct bootmem_data *bdata,
|
||||
unsigned long size, unsigned long align,
|
||||
unsigned long goal, unsigned long limit)
|
||||
{
|
||||
|
@ -589,7 +589,7 @@ static void * __init alloc_arch_preferred_bootmem(bootmem_data_t *bdata,
|
|||
p_bdata = bootmem_arch_preferred_node(bdata, size, align,
|
||||
goal, limit);
|
||||
if (p_bdata)
|
||||
return alloc_bootmem_core(p_bdata, size, align,
|
||||
return alloc_bootmem_bdata(p_bdata, size, align,
|
||||
goal, limit);
|
||||
}
|
||||
#endif
|
||||
|
@ -615,7 +615,7 @@ static void * __init ___alloc_bootmem_nopanic(unsigned long size,
|
|||
if (limit && bdata->node_min_pfn >= PFN_DOWN(limit))
|
||||
break;
|
||||
|
||||
region = alloc_bootmem_core(bdata, size, align, goal, limit);
|
||||
region = alloc_bootmem_bdata(bdata, size, align, goal, limit);
|
||||
if (region)
|
||||
return region;
|
||||
}
|
||||
|
@ -695,7 +695,7 @@ static void * __init ___alloc_bootmem_node(bootmem_data_t *bdata,
|
|||
if (ptr)
|
||||
return ptr;
|
||||
|
||||
ptr = alloc_bootmem_core(bdata, size, align, goal, limit);
|
||||
ptr = alloc_bootmem_bdata(bdata, size, align, goal, limit);
|
||||
if (ptr)
|
||||
return ptr;
|
||||
|
||||
|
@ -744,7 +744,7 @@ void * __init __alloc_bootmem_node_high(pg_data_t *pgdat, unsigned long size,
|
|||
unsigned long new_goal;
|
||||
|
||||
new_goal = MAX_DMA32_PFN << PAGE_SHIFT;
|
||||
ptr = alloc_bootmem_core(pgdat->bdata, size, align,
|
||||
ptr = alloc_bootmem_bdata(pgdat->bdata, size, align,
|
||||
new_goal, 0);
|
||||
if (ptr)
|
||||
return ptr;
|
||||
|
@ -773,7 +773,7 @@ void * __init alloc_bootmem_section(unsigned long size,
|
|||
goal = pfn << PAGE_SHIFT;
|
||||
bdata = &bootmem_node_data[early_pfn_to_nid(pfn)];
|
||||
|
||||
return alloc_bootmem_core(bdata, size, SMP_CACHE_BYTES, goal, 0);
|
||||
return alloc_bootmem_bdata(bdata, size, SMP_CACHE_BYTES, goal, 0);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -789,7 +789,7 @@ void * __init __alloc_bootmem_node_nopanic(pg_data_t *pgdat, unsigned long size,
|
|||
if (ptr)
|
||||
return ptr;
|
||||
|
||||
ptr = alloc_bootmem_core(pgdat->bdata, size, align, goal, 0);
|
||||
ptr = alloc_bootmem_bdata(pgdat->bdata, size, align, goal, 0);
|
||||
if (ptr)
|
||||
return ptr;
|
||||
|
||||
|
|
Loading…
Reference in a new issue