aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2017-10-25 08:07:41 +0200
committerErlang/OTP <[email protected]>2017-10-25 08:07:41 +0200
commit3dc05aae44455cf732f787fd73755656f2124fe4 (patch)
treeefa1af349c0be018844196174c8a5a39943a470b /erts/emulator
parent220858e70fdb0a03ee6d92bef97d749f71a6deca (diff)
parent73094884d8113b7290080c6426957d2bf5180ec8 (diff)
downloadotp-3dc05aae44455cf732f787fd73755656f2124fe4.tar.gz
otp-3dc05aae44455cf732f787fd73755656f2124fe4.tar.bz2
otp-3dc05aae44455cf732f787fd73755656f2124fe4.zip
Merge branch 'lukas/erts/fix-cpu-bind-w-modifies-scheduler-avail/OTP-14694' into maint-20
* lukas/erts/fix-cpu-bind-w-modifies-scheduler-avail/OTP-14694: erts: Fix so that bind correct schedulers
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_cpu_topology.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_cpu_topology.c b/erts/emulator/beam/erl_cpu_topology.c
index f8b2fa744f..dfe49ce382 100644
--- a/erts/emulator/beam/erl_cpu_topology.c
+++ b/erts/emulator/beam/erl_cpu_topology.c
@@ -608,7 +608,7 @@ write_schedulers_bind_change(erts_cpu_topology_t *cpudata, int size)
cpu_bind_order_sort(cpudata, size, cpu_bind_order, 1);
- for (cpu_ix = 0; cpu_ix < size && cpu_ix < erts_no_schedulers; cpu_ix++)
+ for (cpu_ix = 0; cpu_ix < size && s_ix <= erts_no_schedulers; cpu_ix++)
if (erts_is_cpu_available(cpuinfo, cpudata[cpu_ix].logical))
scheduler2cpu_map[s_ix++].bind_id = cpudata[cpu_ix].logical;
}