Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[linux.git] / arch / um / kernel / mem.c

diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 3c0e470ea6465872539a37ddab3229ab76eba868..1067469ba2ea54acf89c7ccbe3e4dbd21e2f952e 100644 (file)
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -5,7 +5,7 @@
 
 #include <linux/stddef.h>
 #include <linux/module.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
 #include <linux/highmem.h>
 #include <linux/mm.h>
 #include <linux/swap.h>
@@ -46,11 +46,11 @@ void __init mem_init(void)
         */
        brk_end = (unsigned long) UML_ROUND_UP(sbrk(0));
        map_memory(brk_end, __pa(brk_end), uml_reserved - brk_end, 1, 1, 0);
-       free_bootmem(__pa(brk_end), uml_reserved - brk_end);
+       memblock_free(__pa(brk_end), uml_reserved - brk_end);
        uml_reserved = brk_end;
 
        /* this will put all low memory onto the freelists */
-       free_all_bootmem();
+       memblock_free_all();
        max_low_pfn = totalram_pages;
        max_pfn = totalram_pages;
        mem_init_print_info(NULL);
@@ -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;