Remove the now-unused markScheduler

The global vars {blocked,sleeping}_queue are now in the Capability and
so get marked there via markCapabilityIOManager.

5 files changed, 0 insertions, 13 deletions

diff --git a/rts/Schedule.c b/rts/Schedule.c
index 95eba3f958..67e2ff4ee8 100644
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -2781,11 +2781,6 @@ freeScheduler( void )
 #endif
 }
 
-void markScheduler (evac_fn evac STG_UNUSED,
-                    void *user STG_UNUSED)
-{
-}
-
 /* -----------------------------------------------------------------------------
    performGC
 
diff --git a/rts/Schedule.h b/rts/Schedule.h
index a5b3bb3f26..64f9f7d166 100644
--- a/rts/Schedule.h
+++ b/rts/Schedule.h
@@ -22,7 +22,6 @@
 void initScheduler (void);
 void exitScheduler (bool wait_foreign);
 void freeScheduler (void);
-void markScheduler (evac_fn evac, void *user);
 
 // Place a new thread on the run queue of the current Capability
 void scheduleThread (Capability *cap, StgTSO *tso);
diff --git a/rts/sm/Compact.c b/rts/sm/Compact.c
index 718650456b..3f8a1fcfd6 100644
--- a/rts/sm/Compact.c
+++ b/rts/sm/Compact.c
@@ -20,7 +20,6 @@
 #include "BlockAlloc.h"
 #include "GC.h"
 #include "Compact.h"
-#include "Schedule.h"
 #include "Apply.h"
 #include "Trace.h"
 #include "Weak.h"
@@ -981,8 +980,6 @@ compact(StgClosure *static_objects,
     // 1. thread the roots
     markCapabilities((evac_fn)thread_root, NULL);
 
-    markScheduler((evac_fn)thread_root, NULL);
-
     // the weak pointer lists...
     for (W_ g = 0; g < RtsFlags.GcFlags.generations; g++) {
         if (generations[g].weak_ptr_list != NULL) {
diff --git a/rts/sm/GC.c b/rts/sm/GC.c
index e1930c224b..b315600c3c 100644
--- a/rts/sm/GC.c
+++ b/rts/sm/GC.c
@@ -537,8 +537,6 @@ GarbageCollect (uint32_t collect_gen,
       markCapability(mark_root, gct, cap, true/*don't mark sparks*/);
   }
 
-  markScheduler(mark_root, gct);
-
   // Mark the weak pointer list, and prepare to detect dead weak pointers.
   markWeakPtrList();
   initWeakForGC();
diff --git a/rts/sm/NonMoving.c b/rts/sm/NonMoving.c
index 0e601026ee..4a17386324 100644
--- a/rts/sm/NonMoving.c
+++ b/rts/sm/NonMoving.c
@@ -25,7 +25,6 @@
 #include "NonMovingSweep.h"
 #include "NonMovingCensus.h"
 #include "StablePtr.h" // markStablePtrTable
-#include "Schedule.h" // markScheduler
 #include "Weak.h" // dead_weak_ptr_list
 
 struct NonmovingHeap nonmovingHeap;
@@ -949,7 +948,6 @@ void nonmovingCollect(StgWeak **dead_weaks, StgTSO **resurrected_threads)
         markCapability((evac_fn)markQueueAddRoot, mark_queue,
                 capabilities[n], true/*don't mark sparks*/);
     }
-    markScheduler((evac_fn)markQueueAddRoot, mark_queue);
     nonmovingMarkWeakPtrList(mark_queue, *dead_weaks);
     markStablePtrTable((evac_fn)markQueueAddRoot, mark_queue);