aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-02-08 16:47:41 +0100
committerSverker Eriksson <[email protected]>2016-02-08 16:47:41 +0100
commit1f2cd730babd95607fb265163a70e61f03270981 (patch)
tree53cf5a987ac9f2ba3eb13650fc6fc876368b5154
parent025850013f328cf2179b245a6d130a594a897c8d (diff)
parent1430a673d453ab330a93930719c41a2e786c948f (diff)
downloadotp-1f2cd730babd95607fb265163a70e61f03270981.tar.gz
otp-1f2cd730babd95607fb265163a70e61f03270981.tar.bz2
otp-1f2cd730babd95607fb265163a70e61f03270981.zip
Merge branch 'maint'
-rw-r--r--erts/emulator/beam/erl_process.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 8e1ebe795c..041543b784 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -9706,6 +9706,8 @@ Process *schedule(Process *p, int calls)
erts_smp_proc_lock(p, ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_STATUS);
+ state = erts_smp_atomic32_read_nob(&p->state);
+
if (erts_sched_stat.enabled) {
int prio;
UWord old = ERTS_PROC_SCHED_ID(p,