diff options
| author | Rickard Green <[email protected]> | 2013-06-10 15:23:33 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-06-10 15:23:33 +0200 |
| commit | 0ba92c66a9d778ca455f0400f9d0f03894993af5 (patch) | |
| tree | 2c17307062e038f44218294e28c49905332d4c8a /erts/emulator/beam/erl_alloc.c | |
| parent | e0f24e2e849c0277aa75e59bbc430dfc666e135b (diff) | |
| parent | 9919508b2cc177ec4afdb53bb9d20563973461f8 (diff) | |
| download | otp-0ba92c66a9d778ca455f0400f9d0f03894993af5.tar.gz otp-0ba92c66a9d778ca455f0400f9d0f03894993af5.tar.bz2 otp-0ba92c66a9d778ca455f0400f9d0f03894993af5.zip | |
Merge branch 'maint'
* maint:
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) { |