summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2011-03-30 10:11:47 +0000
committerSimon Marlow <marlowsd@gmail.com>2011-03-30 10:11:47 +0000
commita8051a4b615742040bf1a53bb1ff21236dcc9fcd (patch)
treedfb86d09e95e29feaeeeb60452d1c317bcd20536
parentcdbc494c6932d2ffa32d211bb988a635124bf016 (diff)
downloadhaskell-a8051a4b615742040bf1a53bb1ff21236dcc9fcd.tar.gz
scheduleThreadOn: use TSO_LOCKED even on the non-threaded RTS
-rw-r--r--rts/Schedule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/rts/Schedule.c b/rts/Schedule.c
index 7c945e0ec3..382ba97fbc 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);