merge upstream HEAD

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

diff --git a/rts/Schedule.h b/rts/Schedule.h
index 7760e36..549f555 100644 (file)
--- a/rts/Schedule.h
+++ b/rts/Schedule.h
@@ -14,7 +14,7 @@
 #include "Capability.h"
 #include "Trace.h"
 
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
 
 /* initScheduler(), exitScheduler()
  * Called from STG :  no
@@ -23,6 +23,7 @@ BEGIN_RTS_PRIVATE
 void initScheduler (void);
 void exitScheduler (rtsBool 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);
@@ -44,7 +45,7 @@ void wakeUpRts(void);
 StgWord raiseExceptionHelper (StgRegTable *reg, StgTSO *tso, StgClosure *exception);
 
 /* findRetryFrameHelper */
-StgWord findRetryFrameHelper (StgTSO *tso);
+StgWord findRetryFrameHelper (Capability *cap, StgTSO *tso);
 
 /* Entry point for a new worker */
 void scheduleWorker (Capability *cap, Task *task);
@@ -214,7 +215,7 @@ emptyThreadQueues(Capability *cap)
 
 #endif /* !IN_STG_CODE */
 
-END_RTS_PRIVATE
+#include "EndPrivate.h"
 
 #endif /* SCHEDULE_H */