X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FPrimOps.cmm;h=990d6f31d9a6c40a9d978157e2f9c8f824c03232;hb=819d8189dddeb05e881bc641f0a6ab2cd14ee1ad;hp=153baaaae52d803638d4c2567d3353f4cc7e1211;hpb=73566e25d75588185b0581722406da5c48965c51;p=ghc-hetmet.git

diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm
index 153baaa..990d6f3 100644
--- a/rts/PrimOps.cmm
+++ b/rts/PrimOps.cmm
@@ -1200,7 +1200,7 @@ atomicallyzh_fast
 
   /* Nested transactions are not allowed; raise an exception */
   if (old_trec != NO_TREC) {
-     R1 = GHCziIOBase_NestedAtomically_closure;
+     R1 = base_GHCziIOBase_NestedAtomically_closure;
      jump raisezh_fast;
   }
 
@@ -1975,8 +1975,8 @@ delayzh_fast
 #else
 
     W_ time;
-    time = foreign "C" getourtimeofday();
-    target = (R1 / (TICK_MILLISECS*1000)) + time;
+    time = foreign "C" getourtimeofday() [R1];
+    target = (R1 / (TO_W_(RtsFlags_MiscFlags_tickInterval(RtsFlags))*1000)) + time;
     StgTSO_block_info(CurrentTSO) = target;
 
     /* Insert the new thread in the sleeping queue. */