X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FRtsFlags.c;h=b3b95b32d9f78af3b40c049256bf976b441b5e51;hb=0ee0be109fd00ec629f7a2ad6a597885a0c9d5b4;hp=cbc2bb5261c81980dbec23e5d96c8da027eb1faf;hpb=3b5940fd32df31b56c1ab6891b0a8f338e796049;p=ghc-hetmet.git

diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
index cbc2bb5..b3b95b3 100644
--- a/rts/RtsFlags.c
+++ b/rts/RtsFlags.c
@@ -226,6 +226,7 @@ void initRtsFlagsDefaults(void)
     RtsFlags.ParFlags.wakeupMigrate     = rtsFalse;
     RtsFlags.ParFlags.parGcEnabled      = 1;
     RtsFlags.ParFlags.parGcGen          = 1;
+    RtsFlags.ParFlags.parGcLoadBalancing = 1;
 #endif
 
 #ifdef PAR
@@ -1151,17 +1152,7 @@ error = rtsTrue;
 #if defined(PROFILING)
 		    RtsFlags.ParFlags.nNodes = 1;
 #else
-#if defined(mingw32_HOST_OS)
-                    {
-                        SYSTEM_INFO si;
-                        GetSystemInfo(&si);
-                        RtsFlags.ParFlags.nNodes = si.dwNumberOfProcessors;
-                    }
-#elif defined(HAVE_SYSCONF)
-                    RtsFlags.ParFlags.nNodes = sysconf(_SC_NPROCESSORS_CONF);
-#else
-                    RtsFlags.ParFlags.nNodes = 1;
-#endif
+                    RtsFlags.ParFlags.nNodes = getNumberOfProcessors();
 #endif
 		} else {
 		    RtsFlags.ParFlags.nNodes
@@ -1211,6 +1202,9 @@ error = rtsTrue;
                             error = rtsTrue;
                         }
                         break;
+		    case 'b':
+			RtsFlags.ParFlags.parGcLoadBalancing = rtsFalse;
+			break;
 		    case 'm':
 			RtsFlags.ParFlags.migrate = rtsFalse;
 			break;