aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2014-01-23 15:01:55 +0100
committerRickard Green <[email protected]>2014-01-23 15:01:55 +0100
commit56f30837258ad35272060cea0bdf203ad7b8cc44 (patch)
tree2e21ed13aa15f57e2bc7c096f78930f1b2b5a966 /erts/emulator
parent3aca82c628ca656c5c11dcb44a27ab12f0c76f67 (diff)
parente753b347a4c88d169992ceaa87e775aebf935bf3 (diff)
downloadotp-56f30837258ad35272060cea0bdf203ad7b8cc44.tar.gz
otp-56f30837258ad35272060cea0bdf203ad7b8cc44.tar.bz2
otp-56f30837258ad35272060cea0bdf203ad7b8cc44.zip
Merge branch 'rickard/default_acul/OTP-11604'
* rickard/default_acul/OTP-11604: erts: Use "+Muacul de" as default
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_alloc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index b5ba9bb94a..8094c6ee2e 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -75,9 +75,9 @@
#define ERTS_ALC_DEFAULT_ENABLED_ACUL_EHEAP_ALLOC 45
#define ERTS_ALC_DEFAULT_ENABLED_ACUL_LL_ALLOC 85
-#define ERTS_ALC_DEFAULT_ACUL 0
-#define ERTS_ALC_DEFAULT_ACUL_EHEAP_ALLOC 0
-#define ERTS_ALC_DEFAULT_ACUL_LL_ALLOC 0
+#define ERTS_ALC_DEFAULT_ACUL ERTS_ALC_DEFAULT_ENABLED_ACUL
+#define ERTS_ALC_DEFAULT_ACUL_EHEAP_ALLOC ERTS_ALC_DEFAULT_ENABLED_ACUL_EHEAP_ALLOC
+#define ERTS_ALC_DEFAULT_ACUL_LL_ALLOC ERTS_ALC_DEFAULT_ENABLED_ACUL_LL_ALLOC
#ifndef ERTS_SMP
# undef ERTS_ALC_DEFAULT_ACUL