[project @ 2005-04-27 14:25:17 by simonmar]

[ghc-hetmet.git] / ghc / rts / Storage.c

diff --git a/ghc/rts/Storage.c b/ghc/rts/Storage.c
index 00ed711..536d8b7 100644 (file)
--- a/ghc/rts/Storage.c
+++ b/ghc/rts/Storage.c
@@ -63,18 +63,6 @@ static void *stgAllocForGMP   (size_t size_in_bytes);
 static void *stgReallocForGMP (void *ptr, size_t old_size, size_t new_size);
 static void  stgDeallocForGMP (void *ptr, size_t size);
 
-/*
- * Storage manager mutex
- */
-#if defined(SMP)
-extern Mutex sm_mutex;
-#define ACQUIRE_SM_LOCK   ACQUIRE_LOCK(&sm_mutex)
-#define RELEASE_SM_LOCK   RELEASE_LOCK(&sm_mutex)
-#else
-#define ACQUIRE_SM_LOCK
-#define RELEASE_SM_LOCK
-#endif
-
 static void
 initStep (step *stp, int g, int s)
 {
@@ -972,10 +960,10 @@ checkSanity( void )
        }
 
        for (s = 0; s < n_nurseries; s++) {
-           ASSERT(countBlocks(generations[g].steps[s].blocks)
-                  == generations[g].steps[s].n_blocks);
-           ASSERT(countBlocks(generations[g].steps[s].large_objects)
-                  == generations[g].steps[s].n_large_blocks);
+           ASSERT(countBlocks(nurseries[s].blocks)
+                  == nurseries[s].n_blocks);
+           ASSERT(countBlocks(nurseries[s].large_objects)
+                  == nurseries[s].n_large_blocks);
        }
            
        checkFreeListSanity();