aboutsummaryrefslogtreecommitdiffstats
path: root/erts/lib_src/common
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-08-08 15:27:54 +0200
committerHenrik Nord <[email protected]>2011-08-08 15:27:54 +0200
commitb08528700ecb2c1b890617bcef84db6d61b5e931 (patch)
tree27c61b61a681d67116fc9ef893ab513578dde8bd /erts/lib_src/common
parentfd4e2b1454990ed597591f2fb2d02e8ba17d4dac (diff)
parent9ea7da397fa93cc2cb62e27ba2b6ca5e815e0f22 (diff)
downloadotp-b08528700ecb2c1b890617bcef84db6d61b5e931.tar.gz
otp-b08528700ecb2c1b890617bcef84db6d61b5e931.tar.bz2
otp-b08528700ecb2c1b890617bcef84db6d61b5e931.zip
Merge branch 'dev' into major
Diffstat (limited to 'erts/lib_src/common')
-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 {