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_alloc.types | |
| 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_alloc.types')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.types | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types index 7b27b3dda9..0a4407f009 100644 --- a/erts/emulator/beam/erl_alloc.types +++ b/erts/emulator/beam/erl_alloc.types @@ -294,7 +294,6 @@ type PORT_LOCK STANDARD SYSTEM port_lock type DRIVER_LOCK STANDARD SYSTEM driver_lock type XPORTS_LIST SHORT_LIVED SYSTEM extra_port_list type PROC_LCK_WTR LONG_LIVED SYSTEM proc_lock_waiter -type PROC_LCK_QS LONG_LIVED SYSTEM proc_lock_queues type RUNQ_BLNS LONG_LIVED SYSTEM run_queue_balancing type THR_PRGR_IDATA LONG_LIVED SYSTEM thr_prgr_internal_data type THR_PRGR_DATA LONG_LIVED SYSTEM thr_prgr_data |