aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2015-08-18 18:13:13 +0200
committerLukas Larsson <[email protected]>2015-08-18 18:13:13 +0200
commite66d39c0f3c6966c4d281c3156942e07fd695d58 (patch)
tree8a1daa47f580f8bd94f3ba618315354209a29247 /erts
parentb907f68075bdb5c6e95fd9503b761842b178486d (diff)
parent0b29b85757d186a5cc94aaa1761e812c95fec2d0 (diff)
downloadotp-e66d39c0f3c6966c4d281c3156942e07fd695d58.tar.gz
otp-e66d39c0f3c6966c4d281c3156942e07fd695d58.tar.bz2
otp-e66d39c0f3c6966c4d281c3156942e07fd695d58.zip
Merge branch 'maint'
* maint: erts: Make sure to unlock status lock when setting process prio
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/erl_process.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index ebfb8afc8c..bad9da90ea 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -9103,6 +9103,10 @@ erts_set_process_priority(Process *p, Eterm value)
a = erts_smp_atomic32_cmpxchg_mb(&p->state, n, e);
} while (a != e);
+
+ if (slocked)
+ erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
+
}
switch (oprio) {