merge GHC HEAD

[ghc-hetmet.git] / rts / Schedule.c

diff --git a/rts/Schedule.c b/rts/Schedule.c
index 9b151d7..fd5536b 100644 (file)
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -2030,16 +2030,7 @@ exitScheduler (rtsBool wait_foreign USED_IF_THREADS)
     }
     sched_state = SCHED_SHUTTING_DOWN;
 
-    nat i;
-
-    for (i = 0; i < n_capabilities; i++) {
-#if defined(THREADED_RTS)
-        ASSERT(task->incall->tso == NULL);
-        shutdownCapability(&capabilities[i], task, wait_foreign);
-#endif
-        traceCapsetRemoveCap(CAPSET_OSPROCESS_DEFAULT, i);
-    }
-    traceCapsetDelete(CAPSET_OSPROCESS_DEFAULT);
+    shutdownCapabilities(task, wait_foreign);
 
     boundTaskExiting(task);
 }