diff options
| author | Rickard Green <[email protected]> | 2018-03-23 14:12:52 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-03-23 14:12:52 +0100 |
| commit | 5c2acbd35150da5e6d3afba1f61bb8bb995bb80f (patch) | |
| tree | 9250351fba7a64b5b1f9ff11fff7da8563ec3155 /erts/emulator/beam/bif.tab | |
| parent | be2bdf8c8c0bd3d110277fcbe8dc3611163087cc (diff) | |
| parent | 83a289d4dff156f2c7203843a1437256545f5580 (diff) | |
| download | otp-5c2acbd35150da5e6d3afba1f61bb8bb995bb80f.tar.gz otp-5c2acbd35150da5e6d3afba1f61bb8bb995bb80f.tar.bz2 otp-5c2acbd35150da5e6d3afba1f61bb8bb995bb80f.zip | |
Merge branch 'rickard/signals/OTP-14589'
* rickard/signals/OTP-14589:
Fix VM probes compilation
Fix lock counting
Fix signal order for is_process_alive
Fix signal handling priority elevation
Diffstat (limited to 'erts/emulator/beam/bif.tab')
| -rw-r--r-- | erts/emulator/beam/bif.tab | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab index 93613ac2eb..687fd39d58 100644 --- a/erts/emulator/beam/bif.tab +++ b/erts/emulator/beam/bif.tab @@ -266,6 +266,7 @@ bif erlang:demonitor/1 bif erlang:demonitor/2 bif erlang:is_process_alive/1 +bif erts_internal:is_process_alive/2 bif erlang:error/1 error_1 bif erlang:error/2 error_2 |