diff options
| author | John Högberg <[email protected]> | 2017-10-25 08:58:33 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-10-25 08:58:33 +0200 |
| commit | 40e787f289a240e6a6b12e03b9501dc492c89aa9 (patch) | |
| tree | 1298495e187d9830935c85c8fae691d8f3ba8a27 /erts/emulator/beam | |
| parent | 9bbe5884cf620aa1c70b92b6e0f3a9d5c3866a9c (diff) | |
| parent | c26f0e58f440859abbfb9b4e3570713ac722e0da (diff) | |
| download | otp-40e787f289a240e6a6b12e03b9501dc492c89aa9.tar.gz otp-40e787f289a240e6a6b12e03b9501dc492c89aa9.tar.bz2 otp-40e787f289a240e6a6b12e03b9501dc492c89aa9.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Update release notes
Update version numbers
erts: Fix so that bind correct schedulers
Update version
Fix error handling when decoding an AVP with an alternate dictionary
Remove unused function arguments
Fix faulty recursion
vsn -> 2.1.2
Update appup for ERIERL-14684
Fix speling error 'sndbuf' -> 'recbuf'
Add zlib:set_controlling_process/2
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_cpu_topology.c | 2 |
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 49f9beb19f..6f8d2f8c35 100644 --- a/erts/emulator/beam/erl_cpu_topology.c +++ b/erts/emulator/beam/erl_cpu_topology.c @@ -602,7 +602,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; } |