summaryrefslogtreecommitdiff
path: root/rts/Capability.c
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2012-01-23 12:12:11 +0000
committerSimon Peyton Jones <simonpj@microsoft.com>2012-01-23 12:12:11 +0000
commitd0e3776f8e4d954160437db27465f1af3c2aea36 (patch)
tree8373478c1aaa2405501424ef73a8b7cf033519db /rts/Capability.c
parent23075169a7d85073cadb211835854436e533f046 (diff)
parent3a3dcc31e401e48771d430f3bf02d5e019b6f997 (diff)
downloadhaskell-d0e3776f8e4d954160437db27465f1af3c2aea36.tar.gz
Merge in more HEAD, fix stuff up
Diffstat (limited to 'rts/Capability.c')
-rw-r--r--rts/Capability.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/rts/Capability.c b/rts/Capability.c
index d04d007006..3177e3bcde 100644
--- a/rts/Capability.c
+++ b/rts/Capability.c
@@ -357,7 +357,7 @@ moreCapabilities (nat from USED_IF_THREADS, nat to USED_IF_THREADS)
initCapability(&capabilities[i], i);
}
- last_free_capability = NULL;
+ last_free_capability = &capabilities[0];
debugTrace(DEBUG_sched, "allocated %d more capabilities", to - from);