aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src
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/preloaded/src
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/preloaded/src')
-rw-r--r--erts/preloaded/src/erlang.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 1ed6b6b284..f37a3fc5db 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2534,7 +2534,7 @@ subtract(_,_) ->
%% These are deliberately not documented
(internal_cpu_topology, term()) -> term();
(sequential_tracer, pid() | port() | {module(), term()} | false) -> pid() | port() | false;
- (1,0) -> true.
+ (reset_seq_trace,true) -> true.
system_flag(_Flag, _Value) ->
erlang:nif_error(undefined).