diff options
author | Sverker Eriksson <[email protected]> | 2014-10-13 15:35:18 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2014-10-13 15:35:18 +0200 |
commit | 7c4237e6d34b23020fca983731a3c7f07a10a8b5 (patch) | |
tree | a23d6db27e7536b4cd82d8a31a0d14f17063553d /erts/emulator/beam/erl_alloc.types | |
parent | 0f0e3e0eae73396836544c7f1629c96b2d182c43 (diff) | |
parent | 56daa687a24a26ab08434c68ca172d5bd31cfdf7 (diff) | |
download | otp-7c4237e6d34b23020fca983731a3c7f07a10a8b5.tar.gz otp-7c4237e6d34b23020fca983731a3c7f07a10a8b5.tar.bz2 otp-7c4237e6d34b23020fca983731a3c7f07a10a8b5.zip |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_alloc.types')
-rw-r--r-- | erts/emulator/beam/erl_alloc.types | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types index 37354b7f8d..df33bbc2f7 100644 --- a/erts/emulator/beam/erl_alloc.types +++ b/erts/emulator/beam/erl_alloc.types @@ -267,7 +267,6 @@ type CODE_IX_LOCK_Q SHORT_LIVED SYSTEM code_ix_lock_q type PROC_INTERVAL LONG_LIVED SYSTEM process_interval type BUSY_CALLER_TAB SHORT_LIVED SYSTEM busy_caller_table type BUSY_CALLER SHORT_LIVED SYSTEM busy_caller -type PORT_DATA_HEAP STANDARD SYSTEM port_data_heap type PROC_SYS_TSK SHORT_LIVED PROCESSES proc_sys_task type PROC_SYS_TSK_QS SHORT_LIVED PROCESSES proc_sys_task_queues @@ -364,6 +363,7 @@ type NLINK_SH STANDARD_LOW PROCESSES nlink_sh type AINFO_REQ STANDARD_LOW SYSTEM alloc_info_request type SCHED_WTIME_REQ STANDARD_LOW SYSTEM sched_wall_time_request type GC_INFO_REQ STANDARD_LOW SYSTEM gc_info_request +type PORT_DATA_HEAP STANDARD_LOW SYSTEM port_data_heap +else # "fullword" @@ -383,6 +383,7 @@ type NLINK_SH FIXED_SIZE PROCESSES nlink_sh type AINFO_REQ SHORT_LIVED SYSTEM alloc_info_request type SCHED_WTIME_REQ SHORT_LIVED SYSTEM sched_wall_time_request type GC_INFO_REQ SHORT_LIVED SYSTEM gc_info_request +type PORT_DATA_HEAP STANDARD SYSTEM port_data_heap +endif |