diff options
| author | Rickard Green <[email protected]> | 2011-12-01 09:46:56 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-12-01 09:46:56 +0100 |
| commit | 736bd3aa619244786c32c882001604210f846fa4 (patch) | |
| tree | da11794c3c2cef789a51ff861d7e2b1b1b244d82 /erts/emulator/beam/erl_lock_check.c | |
| parent | 40653b86e7812fcbcdc73f2becdfbcc43f8814e7 (diff) | |
| parent | 8781932b3b8769b6f208ac7c00471122ec7dd055 (diff) | |
| download | otp-736bd3aa619244786c32c882001604210f846fa4.tar.gz otp-736bd3aa619244786c32c882001604210f846fa4.tar.bz2 otp-736bd3aa619244786c32c882001604210f846fa4.zip | |
Merge branch 'rickard/rm-common-runq/OTP-9727'
* rickard/rm-common-runq/OTP-9727:
Remove common run-queue in SMP case
Fix scheduler suspend bug
Conflicts:
erts/emulator/beam/erl_init.c
Diffstat (limited to 'erts/emulator/beam/erl_lock_check.c')
| -rw-r--r-- | erts/emulator/beam/erl_lock_check.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c index 0dd99b3aa1..09e85893c3 100644 --- a/erts/emulator/beam/erl_lock_check.c +++ b/erts/emulator/beam/erl_lock_check.c @@ -173,7 +173,6 @@ static erts_lc_lock_order_t erts_lock_order[] = { { "pix_lock", "address" }, { "run_queues_lists", NULL }, { "sched_stat", NULL }, - { "run_queue_sleep_list", "address" }, #endif { "async_init_mtx", NULL }, #ifdef ERTS_SMP |