aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/mm/srmmu.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sparc/mm/srmmu.c')
-rw-r--r--arch/sparc/mm/srmmu.c10
1 files changed, 5 insertions, 5 deletions
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)
303 303
304 bitmap_bits = srmmu_nocache_size >> SRMMU_NOCACHE_BITMAP_SHIFT; 304 bitmap_bits = srmmu_nocache_size >> SRMMU_NOCACHE_BITMAP_SHIFT;
305 305
306 srmmu_nocache_pool = memblock_alloc_from(srmmu_nocache_size, 306 srmmu_nocache_pool = memblock_alloc(srmmu_nocache_size,
307 SRMMU_NOCACHE_ALIGN_MAX, 0UL); 307 SRMMU_NOCACHE_ALIGN_MAX);
308 memset(srmmu_nocache_pool, 0, srmmu_nocache_size); 308 memset(srmmu_nocache_pool, 0, srmmu_nocache_size);
309 309
310 srmmu_nocache_bitmap = 310 srmmu_nocache_bitmap =
311 memblock_alloc_from(BITS_TO_LONGS(bitmap_bits) * sizeof(long), 311 memblock_alloc(BITS_TO_LONGS(bitmap_bits) * sizeof(long),
312 SMP_CACHE_BYTES, 0UL); 312 SMP_CACHE_BYTES);
313 bit_map_init(&srmmu_nocache_map, srmmu_nocache_bitmap, bitmap_bits); 313 bit_map_init(&srmmu_nocache_map, srmmu_nocache_bitmap, bitmap_bits);
314 314
315 srmmu_swapper_pg_dir = __srmmu_get_nocache(SRMMU_PGD_TABLE_SIZE, SRMMU_PGD_TABLE_SIZE); 315 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)
467 unsigned long size; 467 unsigned long size;
468 468
469 size = numctx * sizeof(struct ctx_list); 469 size = numctx * sizeof(struct ctx_list);
470 ctx_list_pool = memblock_alloc_from(size, SMP_CACHE_BYTES, 0UL); 470 ctx_list_pool = memblock_alloc(size, SMP_CACHE_BYTES);
471 471
472 for (ctx = 0; ctx < numctx; ctx++) { 472 for (ctx = 0; ctx < numctx; ctx++) {
473 struct ctx_list *clist; 473 struct ctx_list *clist;