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/global.h | |
| 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/global.h')
| -rw-r--r-- | erts/emulator/beam/global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index f1c6adeedd..36b753ca9c 100644 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -962,7 +962,7 @@ void init_break_handler(void); void erts_set_ignore_break(void); void erts_replace_intr(void); void process_info(fmtfn_t, void *); -void print_process_info(fmtfn_t, void *, Process*); +void print_process_info(fmtfn_t, void *, Process*, ErtsProcLocks); void info(fmtfn_t, void *); void loaded(fmtfn_t, void *); void erts_print_base64(fmtfn_t to, void *to_arg, byte* src, Uint size); |