Messages in this thread Patch in this message | | | From | Santosh Shilimkar <> | Subject | [RFC 16/23] mm/hugetlb: Use memblock apis for early memory allocations | Date | Sat, 12 Oct 2013 17:58:59 -0400 |
| |
From: Grygorii Strashko <grygorii.strashko@ti.com>
Switch to memblock interfaces for early memory allocator
Cc: Yinghai Lu <yinghai@kernel.org> Cc: Tejun Heo <tj@kernel.org> Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> --- mm/hugetlb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index b49579c..fe0cab4 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1282,9 +1282,9 @@ int __weak alloc_bootmem_huge_page(struct hstate *h) for_each_node_mask_to_alloc(h, nr_nodes, node, &node_states[N_MEMORY]) { void *addr; - addr = __alloc_bootmem_node_nopanic(NODE_DATA(node), - huge_page_size(h), huge_page_size(h), 0); - + addr = memblock_early_alloc_try_nid_nopanic(node, + huge_page_size(h), huge_page_size(h), + 0, BOOTMEM_ALLOC_ACCESSIBLE); if (addr) { /* * Use the beginning of the huge page to store the @@ -1324,8 +1324,8 @@ static void __init gather_bootmem_prealloc(void) #ifdef CONFIG_HIGHMEM page = pfn_to_page(m->phys >> PAGE_SHIFT); - free_bootmem_late((unsigned long)m, - sizeof(struct huge_bootmem_page)); + memblock_free_late(__pa(m), + sizeof(struct huge_bootmem_page)); #else page = virt_to_page(m); #endif -- 1.7.9.5
| |