X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FRtsStartup.c;h=774de72e380cb0c29e6fe9db9069c6fca239c553;hp=0ce17fe16f10265fb5f4de7ab89da7cf2122af31;hb=9367b24fde0c3f5efa5934e69571f5834ed43548;hpb=eacbef6dc436008473b333df551937224d901092

diff --git a/rts/RtsStartup.c b/rts/RtsStartup.c
index 0ce17fe..774de72 100644
--- a/rts/RtsStartup.c
+++ b/rts/RtsStartup.c
@@ -330,7 +330,9 @@ hs_add_root(void (*init_root)(void))
 {
     bdescr *bd;
     nat init_sp;
-    Capability *cap = &MainCapability;
+    Capability *cap;
+
+    cap = rts_lock();
 
     if (hs_init_count <= 0) {
 	barf("hs_add_root() must be called after hs_init()");
@@ -357,6 +359,8 @@ hs_add_root(void (*init_root)(void))
     // ToDo: make this work in the presence of multiple hs_add_root()s.
     initProfiling2();
 
+    rts_unlock(cap);
+
     // ditto.
 #if defined(THREADED_RTS)
     ioManagerStart();