Use a separate mutex to protect all_tasks, avoiding a lock-order-reversal

[ghc-hetmet.git] / rts / StgMiscClosures.cmm

diff --git a/rts/StgMiscClosures.cmm b/rts/StgMiscClosures.cmm
index 1bc6dc6..c981cbe 100644 (file)
--- a/rts/StgMiscClosures.cmm
+++ b/rts/StgMiscClosures.cmm
@@ -272,7 +272,7 @@ retry:
         ("ptr" msg) = foreign "C" allocate(MyCapability() "ptr", 
                                            BYTES_TO_WDS(SIZEOF_MessageBlackHole)) [R1];
         
-        StgHeader_info(msg) = stg_MSG_BLACKHOLE_info;
+        SET_HDR(msg, stg_MSG_BLACKHOLE_info, CCS_SYSTEM);
         MessageBlackHole_tso(msg) = CurrentTSO;
         MessageBlackHole_bh(msg) = R1;
                
@@ -546,7 +546,7 @@ INFO_TABLE_CONSTR(stg_MVAR_TSO_QUEUE,2,0,0,PRIM,"MVAR_TSO_QUEUE","MVAR_TSO_QUEUE
    replace them with references to the static objects.
    ------------------------------------------------------------------------- */
 
-#if defined(__PIC__) && defined(mingw32_TARGET_OS)
+#if defined(__PIC__) && defined(mingw32_HOST_OS)
 /*
  * When sticking the RTS in a Windows DLL, we delay populating the
  * Charlike and Intlike tables until load-time, which is only