aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2010-08-31 15:36:59 +0200
committerRickard Green <[email protected]>2010-08-31 15:36:59 +0200
commitd6559386aaf37419864885bcd6bf43a9af8480b7 (patch)
treed8c60a6c3d94e491ff0b2af62443f618731af881 /erts/emulator/beam
parentcdf4fceaf40ddd00fa2d54d398828f0a4def1d70 (diff)
parent4b9764486a928ef737da318bdb50d0ebe68f8a93 (diff)
downloadotp-d6559386aaf37419864885bcd6bf43a9af8480b7.tar.gz
otp-d6559386aaf37419864885bcd6bf43a9af8480b7.tar.bz2
otp-d6559386aaf37419864885bcd6bf43a9af8480b7.zip
Merge branch 'rickard/cpu-info-unbind/8765' into dev
* rickard/cpu-info-unbind/8765: Fix erroneous error reports about unbind failure
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/erl_process.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 5371153a79..761096e9ad 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -3970,13 +3970,13 @@ check_cpu_bind(ErtsSchedulerData *esdp)
goto unbind;
}
}
- else if (cpu_id < 0) /* && scheduler2cpu_map[esdp->no].bound_id >= 0) */ {
+ else if (cpu_id < 0) {
unbind:
/* Get rid of old binding */
res = erts_unbind_from_cpu(erts_cpuinfo);
if (res == 0)
esdp->cpu_id = scheduler2cpu_map[esdp->no].bound_id = -1;
- else {
+ else if (res != -ENOTSUP) {
erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
erts_dsprintf(dsbufp, "Scheduler %d failed to unbind from cpu %d: %s\n",
(int) esdp->no, cpu_id, erl_errno_id(-res));