1 files changed, 6 insertions, 4 deletions

diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 3c0e470ea646..185f6bb79269 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -64,7 +64,8 @@ void __init mem_init(void)
 static void __init one_page_table_init(pmd_t *pmd)
 {
         if (pmd_none(*pmd)) {
-                pte_t *pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
+                pte_t *pte = (pte_t *) memblock_alloc_low(PAGE_SIZE,
+                                                          PAGE_SIZE);
                 set_pmd(pmd, __pmd(_KERNPG_TABLE +
                                            (unsigned long) __pa(pte)));
                 if (pte != pte_offset_kernel(pmd, 0))
@@ -75,7 +76,7 @@ static void __init one_page_table_init(pmd_t *pmd)
 static void __init one_md_table_init(pud_t *pud)
 {
 #ifdef CONFIG_3_LEVEL_PGTABLES
-        pmd_t *pmd_table = (pmd_t *) alloc_bootmem_low_pages(PAGE_SIZE);
+        pmd_t *pmd_table = (pmd_t *) memblock_alloc_low(PAGE_SIZE, PAGE_SIZE);
         set_pud(pud, __pud(_KERNPG_TABLE + (unsigned long) __pa(pmd_table)));
         if (pmd_table != pmd_offset(pud, 0))
                 BUG();
@@ -124,7 +125,7 @@ static void __init fixaddr_user_init( void)
                 return;
 
         fixrange_init( FIXADDR_USER_START, FIXADDR_USER_END, swapper_pg_dir);
-        v = (unsigned long) alloc_bootmem_low_pages(size);
+        v = (unsigned long) memblock_alloc_low(size, PAGE_SIZE);
         memcpy((void *) v , (void *) FIXADDR_USER_START, size);
         p = __pa(v);
         for ( ; size > 0; size -= PAGE_SIZE, vaddr += PAGE_SIZE,
@@ -143,7 +144,8 @@ void __init paging_init(void)
         unsigned long zones_size[MAX_NR_ZONES], vaddr;
         int i;
 
-        empty_zero_page = (unsigned long *) alloc_bootmem_low_pages(PAGE_SIZE);
+        empty_zero_page = (unsigned long *) memblock_alloc_low(PAGE_SIZE,
+                                                               PAGE_SIZE);
         for (i = 0; i < ARRAY_SIZE(zones_size); i++)
                 zones_size[i] = 0;