diff options
| author | Lukas Larsson <[email protected]> | 2017-08-23 13:20:27 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-08-23 13:20:27 +0200 |
| commit | 203b66236c5c2c9a2ce81b5998f01e24706984ec (patch) | |
| tree | 903ee279e4f6a9ccc90c1bce48a87f65caf06407 | |
| parent | b2f7b51f420a233a41c885d8b44919d88f1e7ba5 (diff) | |
| download | otp-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.c | 2 |
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)); |