aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-08-03 09:49:24 +0200
committerLukas Larsson <[email protected]>2018-08-03 09:49:24 +0200
commit0ae934aa008f9ff2a929eafc52811fcde619631a (patch)
tree938462b708ac6442bb0dda7b99815505503a4d2a /erts/emulator/sys
parentc33d4c7539a1681cfbc024d8637e204c0a05fd1a (diff)
parentd383549b6e9d9b5e06f23226a61564264204db51 (diff)
downloadotp-0ae934aa008f9ff2a929eafc52811fcde619631a.tar.gz
otp-0ae934aa008f9ff2a929eafc52811fcde619631a.tar.bz2
otp-0ae934aa008f9ff2a929eafc52811fcde619631a.zip
Merge branch 'lukas/erts/seq_trace_fix_token_clear/ERL-602/OTP-15038' into maint
* lukas/erts/seq_trace_fix_token_clear/ERL-602/OTP-15038: erts: Fix seq_trace to not clear token for system messages
Diffstat (limited to 'erts/emulator/sys')
-rw-r--r--erts/emulator/sys/common/erl_check_io.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c
index 3e77dce1cd..9f115706dc 100644
--- a/erts/emulator/sys/common/erl_check_io.c
+++ b/erts/emulator/sys/common/erl_check_io.c
@@ -1493,7 +1493,6 @@ send_event_tuple(struct erts_nif_select_event* e, ErtsResource* resource,
}
tuple = TUPLE4(hp, am_select, resource_term, ref_term, event_atom);
- ERL_MESSAGE_TOKEN(mp) = am_undefined;
erts_queue_message(rp, rp_locks, mp, tuple, am_system);
if (rp_locks)