[PATCH 08/30] memblock: replace alloc_bootmem_align with memblock_alloc

[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/x86/xen/p2m.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c
index d6d74ef..5de761b 100644
--- a/arch/x86/xen/p2m.c
+++ b/arch/x86/xen/p2m.c
@@ -182,7 +182,7 @@ static void p2m_init_identity(unsigned long *p2m, unsigned 
long pfn)
 static void * __ref alloc_p2m_page(void)
 {
        if (unlikely(!slab_is_available()))
-               return alloc_bootmem_align(PAGE_SIZE, PAGE_SIZE);
+               return memblock_alloc(PAGE_SIZE, PAGE_SIZE);
 
        return (void *)__get_free_page(GFP_KERNEL);
 }
-- 
2.7.4