diff options
| author | Rickard Green <[email protected]> | 2013-06-10 15:22:50 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-06-10 15:22:50 +0200 |
| commit | 9919508b2cc177ec4afdb53bb9d20563973461f8 (patch) | |
| tree | c0defa28e72c3f4afefc17d8964c811b5f53caa4 /erts/emulator/beam/erl_alloc.c | |
| parent | 4d268f98716dfab50b5a42d8ed88c4c9b13fb557 (diff) | |
| parent | 75fbf54df767358e9c3a997ff9a46b994102a0d0 (diff) | |
| download | otp-9919508b2cc177ec4afdb53bb9d20563973461f8.tar.gz otp-9919508b2cc177ec4afdb53bb9d20563973461f8.tar.bz2 otp-9919508b2cc177ec4afdb53bb9d20563973461f8.zip | |
Merge branch 'rickard-sverker/carrier-migration/OTP-10279' into maint
* rickard-sverker/carrier-migration/OTP-10279:
erts: Fix warning
erts: Fix management of redirected carrier to deallocate
Diffstat (limited to 'erts/emulator/beam/erl_alloc.c')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c index a547191d6d..86575ccb9b 100644 --- a/erts/emulator/beam/erl_alloc.c +++ b/erts/emulator/beam/erl_alloc.c @@ -240,6 +240,10 @@ do { \ sys_memcpy((void *) (IP), (void *) &aui__, sizeof(struct au_init)); \ } while (0) +#if ERTS_ALC_DEFAULT_ACUL \ + || ERTS_ALC_DEFAULT_ACUL_LL_ALLOC \ + || ERTS_ALC_DEFAULT_ACUL_EHEAP_ALLOC + static ERTS_INLINE void set_default_acul(struct au_init *ip, int acul) { @@ -249,6 +253,8 @@ set_default_acul(struct au_init *ip, int acul) ip->init.util.acul = acul; } +#endif + static void set_default_sl_alloc_opts(struct au_init *ip) { |