diff options
author | Sverker Eriksson <[email protected]> | 2018-11-15 15:48:38 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2018-11-15 15:48:38 +0100 |
commit | efe633d2c22daea6225935a2945fa5d3dd70e50c (patch) | |
tree | 7f111f09a6c261be777831578adb8aad6b970c9e /erts/emulator/beam/erl_alloc.types | |
parent | 870ff6a1ec52003b8b67d3bbfaf68a28184bd0b6 (diff) | |
parent | fefb5d039e87ff7137e78b3d5f2eaf01e498ec4d (diff) | |
download | otp-efe633d2c22daea6225935a2945fa5d3dd70e50c.tar.gz otp-efe633d2c22daea6225935a2945fa5d3dd70e50c.tar.bz2 otp-efe633d2c22daea6225935a2945fa5d3dd70e50c.zip |
Merge branch 'sverker/erts/atomics-counters/OTP-13468' into maint
* sverker/erts/atomics-counters/OTP-13468:
erts: Add new module 'counters'
erts: Add new module 'atomics'
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 3fc036a13c..4f03a34390 100644 --- a/erts/emulator/beam/erl_alloc.types +++ b/erts/emulator/beam/erl_alloc.types @@ -338,6 +338,8 @@ type GC_INFO_REQ SHORT_LIVED SYSTEM gc_info_request type PORT_DATA_HEAP STANDARD SYSTEM port_data_heap type MSACC DRIVER SYSTEM microstate_accounting type SYS_CHECK_REQ SHORT_LIVED SYSTEM system_check_request +type ATOMICS STANDARD SYSTEM erl_bif_atomics +type COUNTERS STANDARD SYSTEM erl_bif_counters # # Types used by system specific code |