3 files changed, 7 insertions, 7 deletions

diff --git a/arch/sparc/kernel/prom_32.c b/arch/sparc/kernel/prom_32.c
index 42d7f2a7da6d..38940afaa696 100644
--- a/arch/sparc/kernel/prom_32.c
+++ b/arch/sparc/kernel/prom_32.c
@@ -32,7 +32,7 @@ void * __init prom_early_alloc(unsigned long size)
 {
         void *ret;
 
-        ret = memblock_alloc_from(size, SMP_CACHE_BYTES, 0UL);
+        ret = memblock_alloc(size, SMP_CACHE_BYTES);
         if (ret != NULL)
                 memset(ret, 0, size);
 
diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index d900952bfc5f..a8ff29821bdb 100644
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c
@@ -264,7 +264,7 @@ void __init mem_init(void)
         i = last_valid_pfn >> ((20 - PAGE_SHIFT) + 5);
         i += 1;
         sparc_valid_addr_bitmap = (unsigned long *)
-                memblock_alloc_from(i << 2, SMP_CACHE_BYTES, 0UL);
+                memblock_alloc(i << 2, SMP_CACHE_BYTES);
 
         if (sparc_valid_addr_bitmap == NULL) {
                 prom_printf("mem_init: Cannot alloc valid_addr_bitmap.\n");
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index b609362e846f..a400ec319564 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -303,13 +303,13 @@ static void __init srmmu_nocache_init(void)
 
         bitmap_bits = srmmu_nocache_size >> SRMMU_NOCACHE_BITMAP_SHIFT;
 
-        srmmu_nocache_pool = memblock_alloc_from(srmmu_nocache_size,
-                                                 SRMMU_NOCACHE_ALIGN_MAX, 0UL);
+        srmmu_nocache_pool = memblock_alloc(srmmu_nocache_size,
+                                            SRMMU_NOCACHE_ALIGN_MAX);
         memset(srmmu_nocache_pool, 0, srmmu_nocache_size);
 
         srmmu_nocache_bitmap =
-                memblock_alloc_from(BITS_TO_LONGS(bitmap_bits) * sizeof(long),
-                                    SMP_CACHE_BYTES, 0UL);
+                memblock_alloc(BITS_TO_LONGS(bitmap_bits) * sizeof(long),
+                               SMP_CACHE_BYTES);
         bit_map_init(&srmmu_nocache_map, srmmu_nocache_bitmap, bitmap_bits);
 
         srmmu_swapper_pg_dir = __srmmu_get_nocache(SRMMU_PGD_TABLE_SIZE, SRMMU_PGD_TABLE_SIZE);
@@ -467,7 +467,7 @@ static void __init sparc_context_init(int numctx)
         unsigned long size;
 
         size = numctx * sizeof(struct ctx_list);
-        ctx_list_pool = memblock_alloc_from(size, SMP_CACHE_BYTES, 0UL);
+        ctx_list_pool = memblock_alloc(size, SMP_CACHE_BYTES);
 
         for (ctx = 0; ctx < numctx; ctx++) {
                 struct ctx_list *clist;