X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FArena.c;h=fcdc6cce147210ab6be6b9547bff19e4ad22391b;hb=d5a9ee0e98a76bca1b41bbc5252e851c88b3ff4c;hp=76ac23cf88d3e81c65e2208627fefc4c48cb2946;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/rts/Arena.c b/rts/Arena.c
index 76ac23c..fcdc6cc 100644
--- a/rts/Arena.c
+++ b/rts/Arena.c
@@ -20,7 +20,6 @@
 
 #include "Rts.h"
 #include "RtsUtils.h"
-#include "BlockAlloc.h"
 #include "Arena.h"
 
 #include <stdlib.h>
@@ -43,7 +42,7 @@ newArena( void )
     Arena *arena;
 
     arena = stgMallocBytes(sizeof(Arena), "newArena");
-    arena->current = allocBlock();
+    arena->current = allocBlock_lock();
     arena->current->link = NULL;
     arena->free = arena->current->start;
     arena->lim  = arena->current->start + BLOCK_SIZE_W;
@@ -82,7 +81,7 @@ arenaAlloc( Arena *arena, size_t size )
     } else {
 	// allocate a fresh block...
 	req_blocks =  (lnat)BLOCK_ROUND_UP(size) / BLOCK_SIZE;
-	bd = allocGroup(req_blocks);
+	bd = allocGroup_lock(req_blocks);
 	arena_blocks += req_blocks;
 
 	bd->gen_no  = 0;
@@ -107,7 +106,7 @@ arenaFree( Arena *arena )
 	next = bd->link;
 	arena_blocks -= bd->blocks;
 	ASSERT(arena_blocks >= 0);
-	freeGroup(bd);
+	freeGroup_lock(bd);
     }
     stgFree(arena);
 }