aboutsummaryrefslogtreecommitdiffstats
path: root/erts/lib_src/common/erl_misc_utils.c
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2011-08-16 17:01:45 +0200
committerAnders Svensson <[email protected]>2011-08-16 17:01:45 +0200
commita7c0e439ee84d25ce18f65959be06315063a7de8 (patch)
treeb5a54174171fdd0f10d556c8a96909eb4af7f1d6 /erts/lib_src/common/erl_misc_utils.c
parent5a57f3798edd56caa61514378c673ff78ac397d2 (diff)
parent46af29aac0e851105620dab25644cf27219e2b0a (diff)
downloadotp-a7c0e439ee84d25ce18f65959be06315063a7de8.tar.gz
otp-a7c0e439ee84d25ce18f65959be06315063a7de8.tar.bz2
otp-a7c0e439ee84d25ce18f65959be06315063a7de8.zip
Merge remote branch 'upstream/dev' into dev
Diffstat (limited to 'erts/lib_src/common/erl_misc_utils.c')
-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 {