aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-08-23 13:22:17 +0200
committerLukas Larsson <[email protected]>2017-08-23 13:22:17 +0200
commit9513aed6c04c34f06bd594b771ee9471a5264ac0 (patch)
tree1b20d19d8b032c775caff973199793284e2b3997
parent6016375096c293925c42d73cbbb72e29e5c38131 (diff)
parent203b66236c5c2c9a2ce81b5998f01e24706984ec (diff)
downloadotp-9513aed6c04c34f06bd594b771ee9471a5264ac0.tar.gz
otp-9513aed6c04c34f06bd594b771ee9471a5264ac0.tar.bz2
otp-9513aed6c04c34f06bd594b771ee9471a5264ac0.zip
Merge branch 'lukas/erts/fix_dirty_trace_message_flush/OTP-14538'
* lukas/erts/fix_dirty_trace_message_flush/OTP-14538: 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 0d4f7305d0..c29b13c6c1 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -13672,9 +13672,7 @@ erts_continue_exit_process(Process *p)
erts_proc_lock(p, ERTS_PROC_LOCK_MAIN);
ERTS_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));