From 7f7575ed8097037b09fe8bf2ef306f2c407502d2 Mon Sep 17 00:00:00 2001
From: Wenzel Jakob <wenzel@inf.ethz.ch>
Date: Tue, 1 Jul 2014 23:45:54 +0200
Subject: [PATCH] bugfix for the previous change

---
 src/libcore/thread.cpp | 2 +-
 src/libcore/util.cpp   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libcore/thread.cpp b/src/libcore/thread.cpp
index bea8645b..e325fcd5 100644
--- a/src/libcore/thread.cpp
+++ b/src/libcore/thread.cpp
@@ -360,7 +360,7 @@ void Thread::setCoreAffinity(int coreID) {
 	}
 
 	int actualCoreID = -1, available = 0;
-	for (int i=0; i<nCores; ++i) {
+	for (int i=0; i<nLogicalCores; ++i) {
 		if (!CPU_ISSET_S(i, size, cpuset))
 			continue;
 		if (available++ == coreID) {
diff --git a/src/libcore/util.cpp b/src/libcore/util.cpp
index 9d7dc2c2..20179d57 100644
--- a/src/libcore/util.cpp
+++ b/src/libcore/util.cpp
@@ -203,8 +203,9 @@ int getCoreCount() {
 		}
 
 		int availableCores = 0;
-		for (int i=0; i<nCores; ++i)
+		for (int i=0; i<nLogicalCores; ++i)
 			availableCores += CPU_ISSET_S(i, size, cpuset) ? 1 : 0;
+		nCores = availableCores;
 		CPU_FREE(cpuset);
 	}