From: Simon Marlow <marlowsd@gmail.com>
Date: Wed, 30 Mar 2011 10:11:47 +0000 (+0000)
Subject: scheduleThreadOn: use TSO_LOCKED even on the non-threaded RTS
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=a8051a4b615742040bf1a53bb1ff21236dcc9fcd;p=ghc-hetmet.git

scheduleThreadOn: use TSO_LOCKED even on the non-threaded RTS
---

diff --git a/rts/Schedule.c b/rts/Schedule.c
index 7c945e0..382ba97 100644
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -1874,9 +1874,9 @@ scheduleThread(Capability *cap, StgTSO *tso)
 void
 scheduleThreadOn(Capability *cap, StgWord cpu USED_IF_THREADS, StgTSO *tso)
 {
-#if defined(THREADED_RTS)
     tso->flags |= TSO_LOCKED; // we requested explicit affinity; don't
 			      // move this thread from now on.
+#if defined(THREADED_RTS)
     cpu %= RtsFlags.ParFlags.nNodes;
     if (cpu == cap->no) {
 	appendToRunQueue(cap,tso);