X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStorage.h;h=46081ad69bf984f952c47a1fdde1a1025a422498;hb=0372ac231bd18e993a2533f784805046876d5527;hp=c339c4e012a1630cdf8cd0aa0e5e09ab19d48e2c;hpb=a50e6825494446fdf579a7580d402c99e013657e;p=ghc-hetmet.git

diff --git a/ghc/includes/Storage.h b/ghc/includes/Storage.h
index c339c4e..46081ad 100644
--- a/ghc/includes/Storage.h
+++ b/ghc/includes/Storage.h
@@ -140,7 +140,7 @@ extern void exitStorage(void);
                                 via allocate() since the last GC.
 				Used in the reporting of statistics.
 
-   SMP: allocate and doYouWantToGC can be used from STG code, they are
+   THREADED_RTS: allocate and doYouWantToGC can be used from STG code, they are
    surrounded by a mutex.
    -------------------------------------------------------------------------- */
 
@@ -198,11 +198,12 @@ extern void GarbageCollect(void (*get_roots)(evac_fn),rtsBool force_major_gc);
 /*
  * Storage manager mutex
  */
-#if defined(SMP)
+#if defined(THREADED_RTS)
 extern Mutex sm_mutex;
+extern Mutex atomic_modify_mutvar_mutex;
 #endif
 
-#if defined(SMP)
+#if defined(THREADED_RTS)
 #define ACQUIRE_SM_LOCK   ACQUIRE_LOCK(&sm_mutex);
 #define RELEASE_SM_LOCK   RELEASE_LOCK(&sm_mutex);
 #define ASSERT_SM_LOCK()  ASSERT_LOCK_HELD(&sm_mutex);
@@ -269,7 +270,7 @@ extern rtsBool keepCAFs;
    and is put on the mutable list.
    -------------------------------------------------------------------------- */
 
-void dirty_MUT_VAR(StgClosure *p);
+void dirty_MUT_VAR(StgRegTable *reg, StgClosure *p);
 
 /* -----------------------------------------------------------------------------
    DEBUGGING predicates for pointers