aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-01-20 11:03:13 +0100
committerRickard Green <[email protected]>2016-01-20 11:03:13 +0100
commitf9f2bfcc846f1711a712947c87eb5e690900483a (patch)
treeb03dd888444ee2c672a12aba6ebd4cf2fdf07948 /erts/emulator
parentac6cf5d0b931e8fdb65bd43a9bc241e525517357 (diff)
parenta9d95108304a6d037a12c0772d257358f9900ca4 (diff)
downloadotp-f9f2bfcc846f1711a712947c87eb5e690900483a.tar.gz
otp-f9f2bfcc846f1711a712947c87eb5e690900483a.tar.bz2
otp-f9f2bfcc846f1711a712947c87eb5e690900483a.zip
Merge branch 'maint'
* maint: Fix dirty scheduler check in handle_aux_work
Diffstat (limited to 'erts/emulator')
-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 9431bf98ec..c386d63a9e 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -2182,7 +2182,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