From 203b66236c5c2c9a2ce81b5998f01e24706984ec Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Wed, 23 Aug 2017 13:20:27 +0200
Subject: erts: Fix incorrect merge of dirty_trace_message_flush fix to master

---
 erts/emulator/beam/erl_process.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'erts/emulator/beam')

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));
 
-- 
cgit v1.2.3