diff options
author | Johannes Weiner <hannes@cmpxchg.org> | 2012-05-29 18:06:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-29 19:22:21 -0400 |
commit | c6785b6bf1b2a4b47238b24ee56f61e27c3af682 (patch) | |
tree | a6925c9acfda1a62e61b3d960b1de31be545fc2a /mm/bootmem.c | |
parent | 549381e19cc7874bb15f0e4760c1004d4fe28d8a (diff) |
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>
Diffstat (limited to 'mm/bootmem.c')
-rw-r--r-- | mm/bootmem.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mm/bootmem.c b/mm/bootmem.c index 053ac3f1cfeb..ceed0df3944f 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c | |||
@@ -468,7 +468,7 @@ static unsigned long __init align_off(struct bootmem_data *bdata, | |||
468 | return ALIGN(base + off, align) - base; | 468 | return ALIGN(base + off, align) - base; |
469 | } | 469 | } |
470 | 470 | ||
471 | static void * __init alloc_bootmem_core(struct bootmem_data *bdata, | 471 | static void * __init alloc_bootmem_bdata(struct bootmem_data *bdata, |
472 | unsigned long size, unsigned long align, | 472 | unsigned long size, unsigned long align, |
473 | unsigned long goal, unsigned long limit) | 473 | unsigned long goal, unsigned long limit) |
474 | { | 474 | { |
@@ -589,7 +589,7 @@ static void * __init alloc_arch_preferred_bootmem(bootmem_data_t *bdata, | |||
589 | p_bdata = bootmem_arch_preferred_node(bdata, size, align, | 589 | p_bdata = bootmem_arch_preferred_node(bdata, size, align, |
590 | goal, limit); | 590 | goal, limit); |
591 | if (p_bdata) | 591 | if (p_bdata) |
592 | return alloc_bootmem_core(p_bdata, size, align, | 592 | return alloc_bootmem_bdata(p_bdata, size, align, |
593 | goal, limit); | 593 | goal, limit); |
594 | } | 594 | } |
595 | #endif | 595 | #endif |
@@ -615,7 +615,7 @@ restart: | |||
615 | if (limit && bdata->node_min_pfn >= PFN_DOWN(limit)) | 615 | if (limit && bdata->node_min_pfn >= PFN_DOWN(limit)) |
616 | break; | 616 | break; |
617 | 617 | ||
618 | region = alloc_bootmem_core(bdata, size, align, goal, limit); | 618 | region = alloc_bootmem_bdata(bdata, size, align, goal, limit); |
619 | if (region) | 619 | if (region) |
620 | return region; | 620 | return region; |
621 | } | 621 | } |
@@ -695,7 +695,7 @@ static void * __init ___alloc_bootmem_node(bootmem_data_t *bdata, | |||
695 | if (ptr) | 695 | if (ptr) |
696 | return ptr; | 696 | return ptr; |
697 | 697 | ||
698 | ptr = alloc_bootmem_core(bdata, size, align, goal, limit); | 698 | ptr = alloc_bootmem_bdata(bdata, size, align, goal, limit); |
699 | if (ptr) | 699 | if (ptr) |
700 | return ptr; | 700 | return ptr; |
701 | 701 | ||
@@ -744,7 +744,7 @@ void * __init __alloc_bootmem_node_high(pg_data_t *pgdat, unsigned long size, | |||
744 | unsigned long new_goal; | 744 | unsigned long new_goal; |
745 | 745 | ||
746 | new_goal = MAX_DMA32_PFN << PAGE_SHIFT; | 746 | new_goal = MAX_DMA32_PFN << PAGE_SHIFT; |
747 | ptr = alloc_bootmem_core(pgdat->bdata, size, align, | 747 | ptr = alloc_bootmem_bdata(pgdat->bdata, size, align, |
748 | new_goal, 0); | 748 | new_goal, 0); |
749 | if (ptr) | 749 | if (ptr) |
750 | return ptr; | 750 | return ptr; |
@@ -773,7 +773,7 @@ void * __init alloc_bootmem_section(unsigned long size, | |||
773 | goal = pfn << PAGE_SHIFT; | 773 | goal = pfn << PAGE_SHIFT; |
774 | bdata = &bootmem_node_data[early_pfn_to_nid(pfn)]; | 774 | bdata = &bootmem_node_data[early_pfn_to_nid(pfn)]; |
775 | 775 | ||
776 | return alloc_bootmem_core(bdata, size, SMP_CACHE_BYTES, goal, 0); | 776 | return alloc_bootmem_bdata(bdata, size, SMP_CACHE_BYTES, goal, 0); |
777 | } | 777 | } |
778 | #endif | 778 | #endif |
779 | 779 | ||
@@ -789,7 +789,7 @@ void * __init __alloc_bootmem_node_nopanic(pg_data_t *pgdat, unsigned long size, | |||
789 | if (ptr) | 789 | if (ptr) |
790 | return ptr; | 790 | return ptr; |
791 | 791 | ||
792 | ptr = alloc_bootmem_core(pgdat->bdata, size, align, goal, 0); | 792 | ptr = alloc_bootmem_bdata(pgdat->bdata, size, align, goal, 0); |
793 | if (ptr) | 793 | if (ptr) |
794 | return ptr; | 794 | return ptr; |
795 | 795 | ||