aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/atom.names
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-12-20 10:10:51 +0100
committerLukas Larsson <[email protected]>2018-12-20 10:10:51 +0100
commit58d4bef716136bb1681fcdd0c8502d681ccd9cd3 (patch)
treefc64c1725937b7967bd1163e9e51cb8b0ea41a1a /erts/emulator/beam/atom.names
parent9aac178d30c5bad940e68a7eb8a36596df5ed903 (diff)
parent27ff974bfa155ad31dcdc338d7fecf36b08a0516 (diff)
downloadotp-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/atom.names')
-rw-r--r--erts/emulator/beam/atom.names1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index a14f22b19e..291bc95604 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -546,6 +546,7 @@ atom reload
atom rem
atom report_errors
atom reset
+atom reset_seq_trace
atom restart
atom return_from
atom return_to