diff options
| author | Rickard Green <[email protected]> | 2016-01-20 11:02:39 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-01-20 11:02:39 +0100 |
| commit | a9d95108304a6d037a12c0772d257358f9900ca4 (patch) | |
| tree | c154868a01e87c9f3e354992f9838f8418110272 /erts/emulator | |
| parent | a741a2f03d7a73222c3cfbecbd6c0c32ac598e7c (diff) | |
| parent | 693db9ef9c5a67b36215f21c32f91a986fc5630d (diff) | |
| download | otp-a9d95108304a6d037a12c0772d257358f9900ca4.tar.gz otp-a9d95108304a6d037a12c0772d257358f9900ca4.tar.bz2 otp-a9d95108304a6d037a12c0772d257358f9900ca4.zip | |
Merge branch 'vinoski/check-awdp-esdp' into maint
* vinoski/check-awdp-esdp:
Fix dirty scheduler check in handle_aux_work
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 96d9a2f8b4..dd8bc9a698 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -2239,7 +2239,7 @@ handle_aux_work(ErtsAuxWorkData *awdp, erts_aint32_t orig_aux_work, int waiting) erts_aint32_t aux_work = orig_aux_work; erts_aint32_t ignore = 0; - ASSERT(!ERTS_SCHEDULER_IS_DIRTY(awdp->esdp)); + ASSERT(!awdp->esdp || !ERTS_SCHEDULER_IS_DIRTY(awdp->esdp)); #ifdef ERTS_SMP haw_thr_prgr_current_reset(awdp); #endif |