diff options
author | Patrik Nyblom <[email protected]> | 2012-02-07 19:51:24 +0100 |
---|---|---|
committer | Patrik Nyblom <[email protected]> | 2012-02-07 19:51:24 +0100 |
commit | d0394af6541d99bd72192d35fc4986016c3a6589 (patch) | |
tree | 8251b6147db0ea64f90b25b941d951c58bb150a2 /erts/emulator/beam/erl_alloc.types | |
parent | e9e34e8bd838ef99ed3bd0e88ff490614cbe78a1 (diff) | |
parent | 6004ec3e1785913ff0b74054cf614a35c180d54a (diff) | |
download | otp-d0394af6541d99bd72192d35fc4986016c3a6589.tar.gz otp-d0394af6541d99bd72192d35fc4986016c3a6589.tar.bz2 otp-d0394af6541d99bd72192d35fc4986016c3a6589.zip |
Merge branch 'maint'
Conflicts:
erts/doc/src/erlang.xml
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/emulator/beam/erl_alloc.types')
-rw-r--r-- | erts/emulator/beam/erl_alloc.types | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types index 962db8b831..90a6c0cbee 100644 --- a/erts/emulator/beam/erl_alloc.types +++ b/erts/emulator/beam/erl_alloc.types @@ -367,6 +367,7 @@ type EXPORT LONG_LIVED_LOW CODE export_entry type MONITOR_SH STANDARD_LOW PROCESSES monitor_sh 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 +else # "fullword" @@ -383,6 +384,7 @@ type EXPORT LONG_LIVED CODE export_entry type MONITOR_SH FIXED_SIZE PROCESSES monitor_sh 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 +endif |