X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FUpdates.h;h=5872157c81be52eeb06c18fad205c2054dedbd12;hb=d2e1c2cedb08a30f9d9b7c82904b3baa1e351dfa;hp=c5af055410082a72817ffb9489c9e8006128a417;hpb=beb5737b7ee42c4e9373a505e7d957206d69a30e;p=ghc-hetmet.git

diff --git a/ghc/rts/Updates.h b/ghc/rts/Updates.h
index c5af055..5872157 100644
--- a/ghc/rts/Updates.h
+++ b/ghc/rts/Updates.h
@@ -186,7 +186,7 @@ extern void awakenBlockedQueue(StgBlockingQueueElement *q, StgClosure *node);
  * already have been updated (the mutable list will get messed up
  * otherwise).
  *
- * NB. We do *not* do this in SMP mode, because when we have the
+ * NB. We do *not* do this in THREADED_RTS mode, because when we have the
  * possibility of multiple threads entering the same closure, zeroing
  * the slop in one of the threads would have a disastrous effect on
  * the other (seen in the wild!).
@@ -249,7 +249,7 @@ FILL_SLOP(StgClosure *p)
 
 #endif /* CMINUSMINUS */
 
-#if !defined(DEBUG) || defined(SMP)
+#if !defined(DEBUG) || defined(THREADED_RTS)
 #define DEBUG_FILL_SLOP(p) /* do nothing */
 #else
 #define DEBUG_FILL_SLOP(p) FILL_SLOP(p)
@@ -278,7 +278,7 @@ FILL_SLOP(StgClosure *p)
     if (bdescr_gen_no(bd) != 0 :: CInt) {			\
       foreign "C" recordMutableCap(p1 "ptr",			\
 				   MyCapability() "ptr",	\
-		                   bdescr_gen_no(bd));		\
+		                   bdescr_gen_no(bd)) [R1];	\
       SET_INFO(p1, stg_IND_OLDGEN_info);			\
       LDV_RECORD_CREATE(p1);					\
       TICK_UPD_OLD_IND();					\