aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-08-23 13:20:27 +0200
committerLukas Larsson <[email protected]>2017-08-23 13:20:27 +0200
commit203b66236c5c2c9a2ce81b5998f01e24706984ec (patch)
tree903ee279e4f6a9ccc90c1bce48a87f65caf06407
parentb2f7b51f420a233a41c885d8b44919d88f1e7ba5 (diff)
downloadotp-203b66236c5c2c9a2ce81b5998f01e24706984ec.tar.gz
otp-203b66236c5c2c9a2ce81b5998f01e24706984ec.tar.bz2
otp-203b66236c5c2c9a2ce81b5998f01e24706984ec.zip
erts: Fix incorrect merge of dirty_trace_message_flush fix to master
-rw-r--r--erts/emulator/beam/erl_process.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 0ff9484daf..875b681f1c 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -14107,9 +14107,7 @@ erts_continue_exit_process(Process *p)
erts_smp_proc_lock(p, ERTS_PROC_LOCK_MAIN);
ERTS_SMP_CHK_HAVE_ONLY_MAIN_PROC_LOCK(p);
-#ifdef ERTS_SMP
erts_flush_trace_messages(p, ERTS_PROC_LOCK_MAIN);
-#endif
ERTS_TRACER_CLEAR(&ERTS_TRACER(p));