diff options
| author | Björn Gustavsson <[email protected]> | 2018-11-06 12:06:32 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2018-11-06 12:06:32 +0100 |
| commit | abde22933f5a617376d7db9fd91690e901c996ef (patch) | |
| tree | 7efe4f3dd9baf5c48cde8b01481c0ef661bbd780 /erts/emulator/beam/erl_lock_check.c | |
| parent | c2a3104849583a9e1aa5370873457975bef67296 (diff) | |
| parent | adffe592c98149ac3b7333cf6e46970a13a57350 (diff) | |
| download | otp-abde22933f5a617376d7db9fd91690e901c996ef.tar.gz otp-abde22933f5a617376d7db9fd91690e901c996ef.tar.bz2 otp-abde22933f5a617376d7db9fd91690e901c996ef.zip | |
Merge branch 'maint'
* maint:
Implement a tab for persistent terms in crashdump viewer
Add tests of persistent terms for crashdump_viewer
Add a persistent term storage
Refactor releasing of literals
Extend the sharing-preserving routines to optionally copy literals
Conflicts:
erts/emulator/Makefile.in
erts/emulator/beam/erl_process_dump.c
erts/preloaded/ebin/erts_internal.beam
erts/preloaded/ebin/init.beam
lib/sasl/src/systools_make.erl
Diffstat (limited to 'erts/emulator/beam/erl_lock_check.c')
| -rw-r--r-- | erts/emulator/beam/erl_lock_check.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c index cfa63e7cd9..3aab4828cc 100644 --- a/erts/emulator/beam/erl_lock_check.c +++ b/erts/emulator/beam/erl_lock_check.c @@ -100,6 +100,8 @@ static erts_lc_lock_order_t erts_lock_order[] = { { "proc_btm", "pid" }, { "dist_entry", "address" }, { "dist_entry_links", "address" }, + { "update_persistent_term_permission", NULL }, + { "persistent_term_delete_permission", NULL }, { "code_write_permission", NULL }, { "purge_state", NULL }, { "proc_status", "pid" }, |