aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-05-05 15:26:59 +0200
committerLukas Larsson <[email protected]>2014-05-05 15:26:59 +0200
commit313b7d51f2af565718bc24f122f8c70d45697968 (patch)
treea14b249b76d7f830fc1b8dcc2220799e6b60e569 /erts
parent0b4e2f6e72e66beecb6f78107fab2ddbcbbe9057 (diff)
parentb28cd213a832b258d455e10a8ab230dea79cb84e (diff)
downloadotp-313b7d51f2af565718bc24f122f8c70d45697968.tar.gz
otp-313b7d51f2af565718bc24f122f8c70d45697968.tar.bz2
otp-313b7d51f2af565718bc24f122f8c70d45697968.zip
Merge branch 'maint'
* maint: erts: Fix faulty process suspend assert
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/erl_process.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 3130b207e1..b73f9b7f92 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -6151,7 +6151,7 @@ suspend_process(Process *c_p, Process *p)
if (c_p == p) {
state = erts_smp_atomic32_read_bor_relb(&p->state,
ERTS_PSFLG_SUSPENDED);
- ASSERT(state & ERTS_PSFLG_RUNNING);
+ ASSERT(state & (ERTS_PSFLG_RUNNING|ERTS_PSFLG_RUNNING_SYS));
suspended = (state & ERTS_PSFLG_SUSPENDED) ? -1: 1;
}
else {