diff options
| author | Sverker Eriksson <[email protected]> | 2018-02-12 13:32:51 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-02-12 13:32:51 +0100 |
| commit | 06e88d07a4719a0e15b4e666b16347fad463cee6 (patch) | |
| tree | e340fa0359eeac5906ccb06a6f6adfcc0fc70718 /erts/emulator/beam/bif.c | |
| parent | 194513197e19cd592f3f5c2231510542f5193fe4 (diff) | |
| parent | ecea4b22696dc2aaa57d9f9750fe07efb6b71cde (diff) | |
| download | otp-06e88d07a4719a0e15b4e666b16347fad463cee6.tar.gz otp-06e88d07a4719a0e15b4e666b16347fad463cee6.tar.bz2 otp-06e88d07a4719a0e15b4e666b16347fad463cee6.zip | |
Merge 'sverker/maint-19/alloc-n-migration/ERIERL-88'
into 'sverker/maint-20/alloc-n-migration/ERIERL-88'
OTP-14915
OTP-14916
OTP-14917
OTP-14918
Diffstat (limited to 'erts/emulator/beam/bif.c')
| -rw-r--r-- | erts/emulator/beam/bif.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c index b6595d2a5d..d7a25adccb 100644 --- a/erts/emulator/beam/bif.c +++ b/erts/emulator/beam/bif.c @@ -4905,6 +4905,8 @@ BIF_RETTYPE system_flag_2(BIF_ALIST_2) "scheduled for removal in Erlang/OTP 18. For more\n" "information see the erlang:system_flag/2 documentation.\n"); return erts_bind_schedulers(BIF_P, BIF_ARG_2); + } else if (ERTS_IS_ATOM_STR("erts_alloc", BIF_ARG_1)) { + return erts_alloc_set_dyn_param(BIF_P, BIF_ARG_2); } error: BIF_ERROR(BIF_P, BADARG); |