X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FSchedule.c;h=dee6a557a2f9feb1672892c9a737a594eb3c060e;hp=22e61203a3396441acf643fa016a0e355394f589;hb=b5d7276113c4eaf0dfbb8d12c80c1111d47033cd;hpb=8af9e46751058eecc15d0251c5e250ebcb8367da

diff --git a/rts/Schedule.c b/rts/Schedule.c
index 22e6120..dee6a55 100644
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -2143,6 +2143,7 @@ forkProcess(HsStablePtr *entry
     // inconsistent state in the child.  See also #1391.
     ACQUIRE_LOCK(&sched_mutex);
     ACQUIRE_LOCK(&cap->lock);
+    ACQUIRE_LOCK(&cap->running_task->lock);
 
     pid = fork();
     
@@ -2150,6 +2151,7 @@ forkProcess(HsStablePtr *entry
 	
         RELEASE_LOCK(&sched_mutex);
         RELEASE_LOCK(&cap->lock);
+        RELEASE_LOCK(&cap->running_task->lock);
 
 	// just return the pid
 	rts_unlock(cap);
@@ -2160,6 +2162,7 @@ forkProcess(HsStablePtr *entry
 #if defined(THREADED_RTS)
         initMutex(&sched_mutex);
         initMutex(&cap->lock);
+        initMutex(&cap->running_task->lock);
 #endif
 
 	// Now, all OS threads except the thread that forked are