diff options
| author | Sverker Eriksson <[email protected]> | 2011-07-12 16:17:42 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-07-12 16:17:42 +0200 |
| commit | 66829b77b0becadecb2fef480b66f69e95498bf7 (patch) | |
| tree | 0831a7255d5b2b5e024cbe0f00856ae3e4aa1fec /erts/etc/common/erlexec.c | |
| parent | 80865e03583ebbee63a2a72be708f28c1e4a4f98 (diff) | |
| parent | 089b8c357f5e7c96605c8f8cab4b3c856081dc39 (diff) | |
| download | otp-66829b77b0becadecb2fef480b66f69e95498bf7.tar.gz otp-66829b77b0becadecb2fef480b66f69e95498bf7.tar.bz2 otp-66829b77b0becadecb2fef480b66f69e95498bf7.zip | |
Merge branch 'dev' into major
Diffstat (limited to 'erts/etc/common/erlexec.c')
| -rw-r--r-- | erts/etc/common/erlexec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c index 7e04724f5a..2bd576d8e8 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -64,6 +64,7 @@ static const char plusM_au_allocs[]= { 'u', /* all alloc_util allocators */ 'B', /* binary_alloc */ + 'C', /* sbmbc_alloc */ 'D', /* std_alloc */ 'E', /* ets_alloc */ 'H', /* eheap_alloc */ @@ -93,6 +94,8 @@ static char *plusM_au_alloc_switches[] = { "rsbcst", "sbct", "smbcs", + "sbmbcs", + "sbmbct", NULL }; |