[PATCH 15/30] memblock: replace alloc_bootmem_pages_node with memblock_alloc_node

[Mike Rapoport]

The functions are equivalent, just the later does not require nobootmem
translation layer.

Signed-off-by: Mike Rapoport <r...@linux.vnet.ibm.com>
Acked-by: Michal Hocko <mho...@suse.com>
---
 arch/ia64/mm/init.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 3b85c3e..2169ca5 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -447,19 +447,19 @@ int __init create_mem_map_page_table(u64 start, u64 end, 
void *arg)
        for (address = start_page; address < end_page; address += PAGE_SIZE) {
                pgd = pgd_offset_k(address);
                if (pgd_none(*pgd))
-                       pgd_populate(&init_mm, pgd, 
alloc_bootmem_pages_node(NODE_DATA(node), PAGE_SIZE));
+                       pgd_populate(&init_mm, pgd, 
memblock_alloc_node(PAGE_SIZE, PAGE_SIZE, node));
                pud = pud_offset(pgd, address);
 
                if (pud_none(*pud))
-                       pud_populate(&init_mm, pud, 
alloc_bootmem_pages_node(NODE_DATA(node), PAGE_SIZE));
+                       pud_populate(&init_mm, pud, 
memblock_alloc_node(PAGE_SIZE, PAGE_SIZE, node));
                pmd = pmd_offset(pud, address);
 
                if (pmd_none(*pmd))
-                       pmd_populate_kernel(&init_mm, pmd, 
alloc_bootmem_pages_node(NODE_DATA(node), PAGE_SIZE));
+                       pmd_populate_kernel(&init_mm, pmd, 
memblock_alloc_node(PAGE_SIZE, PAGE_SIZE, node));
                pte = pte_offset_kernel(pmd, address);
 
                if (pte_none(*pte))
-                       set_pte(pte, 
pfn_pte(__pa(alloc_bootmem_pages_node(NODE_DATA(node), PAGE_SIZE)) >> 
PAGE_SHIFT,
+                       set_pte(pte, 
pfn_pte(__pa(memblock_alloc_node(PAGE_SIZE, PAGE_SIZE, node)) >> PAGE_SHIFT,
                                             PAGE_KERNEL));
        }
        return 0;
-- 
2.7.4