X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FSparks.c;h=98d710280b14246491c76f3def5e6ed3f39e8ce1;hb=45252b35151fc55aa19fb6770df5ed8267639083;hp=12af2963809e0f414ac04ec41ce99719f7cc3a20;hpb=c5cd2343c5a86c8cb5349823a9699b30a269f3e8;p=ghc-hetmet.git

diff --git a/ghc/rts/Sparks.c b/ghc/rts/Sparks.c
index 12af296..98d7102 100644
--- a/ghc/rts/Sparks.c
+++ b/ghc/rts/Sparks.c
@@ -1,8 +1,8 @@
 /* ---------------------------------------------------------------------------
  *
- * (c) The GHC Team, 2000-2005
+ * (c) The GHC Team, 2000-2006
  *
- * Sparking support for PARALLEL_HASKELL and SMP versions of the RTS.
+ * Sparking support for PARALLEL_HASKELL and THREADED_RTS versions of the RTS.
  *
  * -------------------------------------------------------------------------*/
 
@@ -22,7 +22,7 @@
 # endif
 #include "Sparks.h"
 
-#if defined(SMP) || defined(PARALLEL_HASKELL)
+#if defined(THREADED_RTS) || defined(PARALLEL_HASKELL)
 
 static INLINE_ME void bump_hd (StgSparkPool *p)
 { p->hd++; if (p->hd == p->lim) p->hd = p->base; }
@@ -50,7 +50,7 @@ initSparkPool(StgSparkPool *pool)
 void
 initSparkPools( void )
 {
-#ifdef SMP
+#ifdef THREADED_RTS
     /* walk over the capabilities, allocating a spark pool for each one */
     nat i;
     for (i = 0; i < n_capabilities; i++) {
@@ -220,7 +220,17 @@ newSpark (StgRegTable *reg, StgClosure *p)
     return 1;
 }
 
-#endif /* PARALLEL_HASKELL || SMP */
+#else
+
+StgInt
+newSpark (StgRegTable *reg, StgClosure *p)
+{
+    /* nothing */
+    return 1;
+}
+
+#endif /* PARALLEL_HASKELL || THREADED_RTS */
+
 
 /* -----------------------------------------------------------------------------
  * 
@@ -290,7 +300,7 @@ void
 disposeSpark(spark)
 StgClosure *spark;
 {
-#if !defined(SMP)
+#if !defined(THREADED_RTS)
   Capability *cap;
   StgSparkPool *pool;