diff options
| author | Lukas Larsson <[email protected]> | 2019-01-15 16:40:24 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-01-15 16:40:24 +0100 |
| commit | 337e8a45ef9e8a6cbe91d004d9bb06a8371eb719 (patch) | |
| tree | 057dcbe3720ef7ff817daab8dfbe1f96c7a38afb /erts/emulator/beam/erl_bif_info.c | |
| parent | 5f5d0b3dd311ef16b7c6cc61d575cd7e5eccc291 (diff) | |
| parent | 6f8bb9b6fb5dc6bda960a95b36274f84e1b6330c (diff) | |
| download | otp-337e8a45ef9e8a6cbe91d004d9bb06a8371eb719.tar.gz otp-337e8a45ef9e8a6cbe91d004d9bb06a8371eb719.tar.bz2 otp-337e8a45ef9e8a6cbe91d004d9bb06a8371eb719.zip | |
Merge branch 'lukas/erts/fix-seq_trace-reset_trace/OTP-15490' into maint
* lukas/erts/fix-seq_trace-reset_trace/OTP-15490:
erts: Remove dead gdb functions from code
erts: Make sure to take main lock when dumping proc info
Diffstat (limited to 'erts/emulator/beam/erl_bif_info.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 9cc95a5c09..6137edef1b 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -4610,6 +4610,7 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2) } } else if (ERTS_IS_ATOM_STR("broken_halt", BIF_ARG_1)) { + erts_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN); broken_halt_test(BIF_ARG_2); } else if (ERTS_IS_ATOM_STR("unique_monotonic_integer_state", BIF_ARG_1)) { |