diff options
| author | Lukas Larsson <[email protected]> | 2014-05-05 15:26:52 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-05-05 15:26:52 +0200 |
| commit | b28cd213a832b258d455e10a8ab230dea79cb84e (patch) | |
| tree | 8a011a20e00ca13bf95f71fb696cab1476c2ffe9 /erts/emulator | |
| parent | 68f597b23c0c771a306149f9c7eaf566cbaa665b (diff) | |
| parent | 8f673dbd8d4cb5c832b6e79bd2304949f4123981 (diff) | |
| download | otp-b28cd213a832b258d455e10a8ab230dea79cb84e.tar.gz otp-b28cd213a832b258d455e10a8ab230dea79cb84e.tar.bz2 otp-b28cd213a832b258d455e10a8ab230dea79cb84e.zip | |
Merge branch 'lukas/erts/suspend_assert/OTP-11906' into maint
* lukas/erts/suspend_assert/OTP-11906:
erts: Fix faulty process suspend assert
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 2 |
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 { |