X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FWeak.c;h=f0103952212399ca567866428f27390ef0015430;hb=7f24ae51ed36c5c0308a2d0de23e243f32a0043c;hp=c6c0e430aa1608395f7e36fa58de9115ffbf1c96;hpb=3f205c430218a2a897c5fb6a1e27b7f6647e6fa9;p=ghc-hetmet.git

diff --git a/ghc/rts/Weak.c b/ghc/rts/Weak.c
index c6c0e43..f010395 100644
--- a/ghc/rts/Weak.c
+++ b/ghc/rts/Weak.c
@@ -36,7 +36,7 @@ StgWeak *weak_ptr_list;
  */
 
 void
-scheduleFinalizers(StgWeak *list)
+scheduleFinalizers(Capability *cap, StgWeak *list)
 {
     StgWeak *w;
     StgTSO *t;
@@ -72,10 +72,9 @@ scheduleFinalizers(StgWeak *list)
 
     IF_DEBUG(weak,debugBelch("weak: batching %d finalizers\n", n));
 
-    arr = (StgMutArrPtrs *)allocate(sizeofW(StgMutArrPtrs) + n);
+    arr = (StgMutArrPtrs *)allocateLocal(cap, sizeofW(StgMutArrPtrs) + n);
     TICK_ALLOC_PRIM(sizeofW(StgMutArrPtrs), n, 0);
     SET_HDR(arr, &stg_MUT_ARR_PTRS_FROZEN_info, CCS_SYSTEM);
-    arr->mut_link = NULL;
     arr->ptrs = n;
 
     n = 0;
@@ -86,12 +85,13 @@ scheduleFinalizers(StgWeak *list)
 	}
     }
 
-    t = createIOThread(RtsFlags.GcFlags.initialStkSize, 
-		       rts_apply(
-			   rts_apply(
+    t = createIOThread(cap, 
+		       RtsFlags.GcFlags.initialStkSize, 
+		       rts_apply(cap,
+			   rts_apply(cap,
 			       (StgClosure *)runFinalizerBatch_closure,
-			       rts_mkInt(n)), 
+			       rts_mkInt(cap,n)), 
 			   (StgClosure *)arr)
 	);
-    scheduleThread(t);
+    scheduleThread(cap,t);
 }