diff options
| author | Rickard Green <[email protected]> | 2014-08-29 16:42:31 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-08-29 16:42:31 +0200 |
| commit | a8e12f7168c14cc765a63a51c838d065412795d7 (patch) | |
| tree | eef42d97fc8cb4d63d939cccc7f3dc9b0cca7511 /erts/emulator/beam/erl_lock_check.c | |
| parent | 25f37cf6c5739126c72bdab3e9ec4f95e87d7a8b (diff) | |
| parent | 14e7c8f79847668d815a55f4328f3a86bd527451 (diff) | |
| download | otp-a8e12f7168c14cc765a63a51c838d065412795d7.tar.gz otp-a8e12f7168c14cc765a63a51c838d065412795d7.tar.bz2 otp-a8e12f7168c14cc765a63a51c838d065412795d7.zip | |
Merge branch 'rickard/runnable-trace-ooo-bug/OTP-12105' into maint
* rickard/runnable-trace-ooo-bug/OTP-12105:
Fix busy_port_SUITE:io_to_busy test-case
Ensure "runnable port" trace messages are not sent out of order
Ensure "runnable proc" trace messages are not sent out of order
Diffstat (limited to 'erts/emulator/beam/erl_lock_check.c')
| -rw-r--r-- | erts/emulator/beam/erl_lock_check.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c index c665aa51a2..b105ece6f1 100644 --- a/erts/emulator/beam/erl_lock_check.c +++ b/erts/emulator/beam/erl_lock_check.c @@ -139,7 +139,6 @@ static erts_lc_lock_order_t erts_lock_order[] = { { "drv_tsd", NULL }, { "async_enq_mtx", NULL }, #ifdef ERTS_SMP - { "sys_msg_q", NULL }, { "atom_tab", NULL }, { "make_ref", NULL }, { "misc_op_list_pre_alloc_lock", "address" }, @@ -148,6 +147,7 @@ static erts_lc_lock_order_t erts_lock_order[] = { { "btm_pre_alloc_lock", NULL, }, { "dist_entry_out_queue", "address" }, { "port_sched_lock", "port_id" }, + { "sys_msg_q", NULL }, { "port_table", NULL }, #endif { "mtrace_op", NULL }, |