From 8a161e06d6e8c6aa133666c5184359b9c1a5838e Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Mon, 9 Sep 2013 14:24:06 -0500
Subject: [PATCH] Bug 912589 - have JSRuntime::helperThreadCount() return
 GetCPUCount(), not GetCPUCount()-1 (r=bhackett)

--HG--
extra : rebase_source : 63918ffad4e0f4c71cf9fc79961b4e794df057b7
---
 js/src/vm/Runtime.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/src/vm/Runtime.h b/js/src/vm/Runtime.h
index 438f5bf858d..613d2fc5327 100644
--- a/js/src/vm/Runtime.h
+++ b/js/src/vm/Runtime.h
@@ -1595,9 +1595,9 @@ struct JSRuntime : public JS::shadow::Runtime,
 
     /* Number of helper threads which should be created for this runtime. */
     size_t helperThreadCount() const {
-#ifdef JS_THREADSAFE
+#ifdef JS_WORKER_THREADS
         if (requestedHelperThreadCount < 0)
-            return js::GetCPUCount() - 1;
+            return js::GetCPUCount();
         return requestedHelperThreadCount;
 #else
         return 0;