aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-08-08 15:26:42 +0200
committerHenrik Nord <[email protected]>2011-08-08 15:26:51 +0200
commit9ea7da397fa93cc2cb62e27ba2b6ca5e815e0f22 (patch)
treeea59a292d59cc2845264c42462acc2e3c0131b48
parentc6c4fba873c52d750e13fd335e008f3b44fb6826 (diff)
parenta13caa7beeec4c54f3879da694231b81b3a7a36d (diff)
downloadotp-9ea7da397fa93cc2cb62e27ba2b6ca5e815e0f22.tar.gz
otp-9ea7da397fa93cc2cb62e27ba2b6ca5e815e0f22.tar.bz2
otp-9ea7da397fa93cc2cb62e27ba2b6ca5e815e0f22.zip
Merge branch 'pg/fix-freebsd-dualcore-detection' into dev
* pg/fix-freebsd-dualcore-detection: Fix bug in FreeBSD topology detection code OTP-9453
-rw-r--r--erts/lib_src/common/erl_misc_utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/lib_src/common/erl_misc_utils.c b/erts/lib_src/common/erl_misc_utils.c
index 5dbf98c7d1..35b148990a 100644
--- a/erts/lib_src/common/erl_misc_utils.c
+++ b/erts/lib_src/common/erl_misc_utils.c
@@ -1511,7 +1511,7 @@ const char* parse_topology_spec_group(erts_cpu_info_t *cpuinfo, const char* xml,
}
}
- if (cacheLevel == 0) {
+ if (parentCacheLevel == 0) {
*core_p = 0;
*processor_p = (*processor_p)++;
} else {