X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FSchedule.c;h=537cee0d536a1e740eb5231478cb523366b4878e;hb=54b748e03297e970bbef9d00a96139798009af0d;hp=ce6a1db705ec692bb6aca6bb214df8960bb94611;hpb=6ca83f41edc4d4db300e129f123fc42eb40a43b0;p=ghc-hetmet.git

diff --git a/rts/Schedule.c b/rts/Schedule.c
index ce6a1db..537cee0 100644
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -1021,7 +1021,7 @@ scheduleDetectDeadlock (Capability *cap, Task *task)
 	    case BlockedOnException:
 	    case BlockedOnMVar:
 		throwToSingleThreaded(cap, task->tso, 
-				      (StgClosure *)NonTermination_closure);
+				      (StgClosure *)nonTermination_closure);
 		return;
 	    default:
 		barf("deadlock: main thread blocked in a strange way");
@@ -1479,9 +1479,7 @@ schedulePostRunThread (StgTSO *t)
             throwToSingleThreaded_(&capabilities[0], t, 
                                    NULL, rtsTrue, NULL);
             
-#ifdef REG_R1
             ASSERT(get_itbl((StgClosure *)t->sp)->type == ATOMICALLY_FRAME);
-#endif
         }
     }
 
@@ -1645,7 +1643,7 @@ scheduleHandleHeapOverflow( Capability *cap, StgTSO *t )
     }
     
     debugTrace(DEBUG_sched,
-	       "--<< thread %ld (%s) stopped: HeapOverflow\n", 
+	       "--<< thread %ld (%s) stopped: HeapOverflow",
 	       (long)t->id, whatNext_strs[t->what_next]);
 
 #if defined(GRAN)
@@ -3154,15 +3152,15 @@ resurrectThreads (StgTSO *threads)
 	case BlockedOnException:
 	    /* Called by GC - sched_mutex lock is currently held. */
 	    throwToSingleThreaded(cap, tso,
-				  (StgClosure *)BlockedOnDeadMVar_closure);
+				  (StgClosure *)blockedOnDeadMVar_closure);
 	    break;
 	case BlockedOnBlackHole:
 	    throwToSingleThreaded(cap, tso,
-				  (StgClosure *)NonTermination_closure);
+				  (StgClosure *)nonTermination_closure);
 	    break;
 	case BlockedOnSTM:
 	    throwToSingleThreaded(cap, tso,
-				  (StgClosure *)BlockedIndefinitely_closure);
+				  (StgClosure *)blockedIndefinitely_closure);
 	    break;
 	case NotBlocked:
 	    /* This might happen if the thread was blocked on a black hole