diff options
| author | Rickard Green <[email protected]> | 2012-07-31 22:09:24 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-07-31 22:09:24 +0200 |
| commit | 8082d20dcf47a143290cd0362ec014dfa998e0f4 (patch) | |
| tree | 16a657691896004cb56b91ba0e70722f373bf3bf /erts/emulator/beam/erl_lock_check.c | |
| parent | a67d0be885529844b3c14102604a38f556e70ecc (diff) | |
| parent | d15c8cec3c9ecbba18fa5ed5cf6e8050c0e1a239 (diff) | |
| download | otp-8082d20dcf47a143290cd0362ec014dfa998e0f4.tar.gz otp-8082d20dcf47a143290cd0362ec014dfa998e0f4.tar.bz2 otp-8082d20dcf47a143290cd0362ec014dfa998e0f4.zip | |
Merge branch 'maint'
* maint:
Use static allocation of process lock queues
Conflicts:
erts/emulator/beam/erl_process_lock.c
erts/emulator/beam/erl_process_lock.h
Diffstat (limited to 'erts/emulator/beam/erl_lock_check.c')
| -rw-r--r-- | erts/emulator/beam/erl_lock_check.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c index 95efd9efc3..11fed4079d 100644 --- a/erts/emulator/beam/erl_lock_check.c +++ b/erts/emulator/beam/erl_lock_check.c @@ -177,9 +177,6 @@ static erts_lc_lock_order_t erts_lock_order[] = { { "sched_stat", NULL }, #endif { "async_init_mtx", NULL }, -#ifdef ERTS_SMP - { "proc_lck_qs_alloc", NULL }, -#endif #ifdef __WIN32__ #ifdef DEBUG { "save_ops_lock", NULL }, |