aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2012-03-20 16:14:19 +0100
committerSverker Eriksson <[email protected]>2012-03-20 16:14:19 +0100
commit2729b5e4476300a965f342ae671c9c985b149b20 (patch)
tree804cd8127db52ef9514cc2b6b5991a49b4b0aa9e
parent99968ae85c02787e414f7501bf8eb50532fe7e92 (diff)
parentf224641b6c6015f26c70a05efb71e5d952c2f0d9 (diff)
downloadotp-2729b5e4476300a965f342ae671c9c985b149b20.tar.gz
otp-2729b5e4476300a965f342ae671c9c985b149b20.tar.bz2
otp-2729b5e4476300a965f342ae671c9c985b149b20.zip
Merge branch 'maint'
-rw-r--r--erts/lib_src/common/erl_misc_utils.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/lib_src/common/erl_misc_utils.c b/erts/lib_src/common/erl_misc_utils.c
index 4806311dfe..162c908285 100644
--- a/erts/lib_src/common/erl_misc_utils.c
+++ b/erts/lib_src/common/erl_misc_utils.c
@@ -727,7 +727,7 @@ adjust_processor_nodes(erts_cpu_info_t *cpuinfo, int no_nodes)
prev = NULL;
this = &cpuinfo->topology[0];
- last = &cpuinfo->topology[cpuinfo->configured-1];
+ last = &cpuinfo->topology[cpuinfo->topology_size-1];
while (1) {
if (processor == this->processor) {
if (node != this->node)
@@ -939,7 +939,7 @@ read_topology(erts_cpu_info_t *cpuinfo)
if (res > 1) {
prev = this++;
- last = &cpuinfo->topology[cpuinfo->configured-1];
+ last = &cpuinfo->topology[cpuinfo->topology_size-1];
while (1) {
this->thread = ((this->node == prev->node
@@ -1094,7 +1094,7 @@ read_topology(erts_cpu_info_t *cpuinfo)
if (res > 1) {
prev = this++;
- last = &cpuinfo->topology[cpuinfo->configured-1];
+ last = &cpuinfo->topology[cpuinfo->topology_size-1];
while (1) {
this->thread = ((this->node == prev->node