diff options
author | Lukas Larsson <[email protected]> | 2018-12-20 10:10:51 +0100 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2018-12-20 10:10:51 +0100 |
commit | 58d4bef716136bb1681fcdd0c8502d681ccd9cd3 (patch) | |
tree | fc64c1725937b7967bd1163e9e51cb8b0ea41a1a /erts/emulator/beam/erl_proc_sig_queue.c | |
parent | 9aac178d30c5bad940e68a7eb8a36596df5ed903 (diff) | |
parent | 27ff974bfa155ad31dcdc338d7fecf36b08a0516 (diff) | |
download | otp-58d4bef716136bb1681fcdd0c8502d681ccd9cd3.tar.gz otp-58d4bef716136bb1681fcdd0c8502d681ccd9cd3.tar.bz2 otp-58d4bef716136bb1681fcdd0c8502d681ccd9cd3.zip |
Merge branch 'lukas/erts/fix-seq_trace-reset_trace/OTP-15490' into maint
* lukas/erts/fix-seq_trace-reset_trace/OTP-15490:
erts: Fix seq_trace:reset_trace dirty gc bug
erts: Use sys_memcpy in copy_one_frag
Diffstat (limited to 'erts/emulator/beam/erl_proc_sig_queue.c')
-rw-r--r-- | erts/emulator/beam/erl_proc_sig_queue.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_proc_sig_queue.c b/erts/emulator/beam/erl_proc_sig_queue.c index f343e984f7..18418a76e1 100644 --- a/erts/emulator/beam/erl_proc_sig_queue.c +++ b/erts/emulator/beam/erl_proc_sig_queue.c @@ -3812,7 +3812,6 @@ clear_seq_trace_token(ErtsMessage *sig) void erts_proc_sig_clear_seq_trace_tokens(Process *c_p) { - ASSERT(erts_thr_progress_is_blocking()); erts_proc_sig_fetch(c_p); ERTS_FOREACH_SIG_PRIVQS(c_p, sig, clear_seq_trace_token(sig)); } |