diff options
| author | John Högberg <[email protected]> | 2017-07-06 12:33:39 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-07-06 12:33:39 +0200 |
| commit | 1f1d20a352d16741c272f14dd7d09632eef13509 (patch) | |
| tree | eab34f895460ee92a3ebcbf6e2d813e1384e65e0 /erts/emulator/beam/erl_lock_check.c | |
| parent | af4f81a46d895c8a217c104c874a912073728374 (diff) | |
| parent | 5a537ae41c2295f7f19e4e01fe90acc7585f5b30 (diff) | |
| download | otp-1f1d20a352d16741c272f14dd7d09632eef13509.tar.gz otp-1f1d20a352d16741c272f14dd7d09632eef13509.tar.bz2 otp-1f1d20a352d16741c272f14dd7d09632eef13509.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_lock_check.c')
| -rw-r--r-- | erts/emulator/beam/erl_lock_check.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c index f270d8baef..85ee703c99 100644 --- a/erts/emulator/beam/erl_lock_check.c +++ b/erts/emulator/beam/erl_lock_check.c @@ -104,7 +104,6 @@ static erts_lc_lock_order_t erts_lock_order[] = { { "db_tab", "address" }, { "proc_status", "pid" }, { "proc_trace", "pid" }, - { "ports_snapshot", NULL }, { "db_tab_fix", "address" }, { "db_hash_slot", "address" }, { "node_table", NULL }, @@ -161,6 +160,9 @@ static erts_lc_lock_order_t erts_lock_order[] = { { "mtrace_op", NULL }, { "instr_x", NULL }, { "instr", NULL }, +#ifdef ERTS_SMP + { "pollsets_lock", NULL }, +#endif { "alcu_allocator", "index" }, { "mseg", NULL }, #ifdef ERTS_SMP @@ -173,7 +175,6 @@ static erts_lc_lock_order_t erts_lock_order[] = { { "get_time", NULL }, { "get_corrected_time", NULL }, { "breakpoints", NULL }, - { "pollsets_lock", NULL }, { "pix_lock", "address" }, { "run_queues_lists", NULL }, { "sched_stat", NULL }, |