X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FSchedule.c;h=3ae1fe0a1bba2f27b7fc12c1ebfef06380131b84;hb=8e832951c495e060e8dc70f7192ef737a127e888;hp=c377974dcaef2281107c9217eb15d8d728b8ef34;hpb=f9d15f9fccae4706fbdf8ee4ecaef7da9953cb74;p=ghc-hetmet.git

diff --git a/rts/Schedule.c b/rts/Schedule.c
index c377974..3ae1fe0 100644
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -2100,9 +2100,10 @@ exitScheduler(
 	for (i = 0; i < n_capabilities; i++) {
 	    shutdownCapability(&capabilities[i], task, wait_foreign);
 	}
-	boundTaskExiting(task);
     }
 #endif
+
+    boundTaskExiting(task);
 }
 
 void
@@ -2261,7 +2262,7 @@ threadStackOverflow(Capability *cap, StgTSO *tso)
 	     "increasing stack size from %ld words to %d.",
 	     (long)tso->stack_size, new_stack_size);
 
-  dest = (StgTSO *)allocateLocal(cap,new_tso_size);
+  dest = (StgTSO *)allocate(cap,new_tso_size);
   TICK_ALLOC_TSO(new_stack_size,0);
 
   /* copy the TSO block and the old stack into the new area */
@@ -2532,7 +2533,7 @@ raiseExceptionHelper (StgRegTable *reg, StgTSO *tso, StgClosure *exception)
 	    // Only create raise_closure if we need to.
 	    if (raise_closure == NULL) {
 		raise_closure = 
-		    (StgThunk *)allocateLocal(cap,sizeofW(StgThunk)+1);
+		    (StgThunk *)allocate(cap,sizeofW(StgThunk)+1);
 		SET_HDR(raise_closure, &stg_raise_info, CCCS);
 		raise_closure->payload[0] = exception;
 	    }