diff options
| author | Rickard Green <[email protected]> | 2012-11-12 14:42:00 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-11-12 14:42:00 +0100 |
| commit | b2d60adf1be948ce4cc257c8422429c08039b4f6 (patch) | |
| tree | 98ab5105b55a2e8f5b4e619f8addc4f66c5e7c8b /erts/emulator | |
| parent | 8510507b00b51da4be335faea40116684a380f9a (diff) | |
| download | otp-b2d60adf1be948ce4cc257c8422429c08039b4f6.tar.gz otp-b2d60adf1be948ce4cc257c8422429c08039b4f6.tar.bz2 otp-b2d60adf1be948ce4cc257c8422429c08039b4f6.zip | |
Fix merge from maint
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 f8b0da1154..61554780c4 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -1599,7 +1599,7 @@ handle_delayed_dealloc_thr_prgr(ErtsAuxWorkData *awdp, erts_aint32_t aux_work, i #define ERTS_MAX_THR_PRGR_LATER_OPS 50 static ERTS_INLINE erts_aint32_t -handle_thr_prgr_later_op(ErtsAuxWorkData *awdp, erts_aint32_t aux_work) +handle_thr_prgr_later_op(ErtsAuxWorkData *awdp, erts_aint32_t aux_work, int waiting) { int lops; ErtsThrPrgrVal current = haw_thr_prgr_current(awdp); |