diff options
| author | Rickard Green <[email protected]> | 2015-06-10 18:07:33 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-06-10 18:07:33 +0200 |
| commit | c8825f09f5df654ab89d417af827bfaa7f185066 (patch) | |
| tree | d9255a7a58e01421f3571f4cd9074b557e8d3567 /erts/emulator/beam/erl_alloc.types | |
| parent | d395b5c5559a18e44258ca46e4b8703189d18067 (diff) | |
| parent | ea84ab6c03994f8d6d9f07d8740f0547f8a3cb51 (diff) | |
| download | otp-c8825f09f5df654ab89d417af827bfaa7f185066.tar.gz otp-c8825f09f5df654ab89d417af827bfaa7f185066.tar.bz2 otp-c8825f09f5df654ab89d417af827bfaa7f185066.zip | |
Merge branch 'rickard/timer-improvement/OTP-12650'
* rickard/timer-improvement/OTP-12650:
Callback timer
Disable accessor timer option
Aux work flag descriptions
Fix test cases
Diffstat (limited to 'erts/emulator/beam/erl_alloc.types')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.types | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types index 57c506458c..2721e13250 100644 --- a/erts/emulator/beam/erl_alloc.types +++ b/erts/emulator/beam/erl_alloc.types @@ -167,7 +167,7 @@ type TIMER_SERVICE LONG_LIVED SYSTEM timer_service type LL_PTIMER FIXED_SIZE PROCESSES ll_ptimer type HL_PTIMER FIXED_SIZE PROCESSES hl_ptimer type BIF_TIMER FIXED_SIZE PROCESSES bif_timer -type ABIF_TIMER FIXED_SIZE PROCESSES accessor_bif_timer +# type ABIF_TIMER FIXED_SIZE PROCESSES accessor_bif_timer type TIMER_REQUEST SHORT_LIVED PROCESSES timer_request type BTM_YIELD_STATE SHORT_LIVED PROCESSES btm_yield_state type REG_TABLE STANDARD SYSTEM reg_tab |