diff options
| author | Sverker Eriksson <[email protected]> | 2016-03-08 19:31:41 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-03-08 19:31:41 +0100 |
| commit | 5750206a0dc33e13913efef73e171e121c082635 (patch) | |
| tree | d55ec7efb50e088e4a0719e8b904f756fd71b124 /erts/etc | |
| parent | c785c540b41db4e2676c0dd462971590779761cf (diff) | |
| parent | 8e2a21f1df1140867d0b074ec7a86610d1e1b51e (diff) | |
| download | otp-5750206a0dc33e13913efef73e171e121c082635.tar.gz otp-5750206a0dc33e13913efef73e171e121c082635.tar.bz2 otp-5750206a0dc33e13913efef73e171e121c082635.zip | |
Merge branch 'sverk/literal-alloc-polish'
* sverk/literal-alloc-polish:
erts: Add emulator flag +MIscs for literal super carrier size
erts: Refactor init of erts_literal_mmapper
erts: Make literal_alloc documented and configurable
Diffstat (limited to 'erts/etc')
| -rw-r--r-- | erts/etc/common/erlexec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c index f21671e837..54da59e50d 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -65,6 +65,7 @@ static const char plusM_au_allocs[]= { 'u', /* all alloc_util allocators */ 'B', /* binary_alloc */ + 'I', /* literal_alloc */ 'D', /* std_alloc */ 'E', /* ets_alloc */ 'F', /* fix_alloc */ @@ -121,6 +122,7 @@ static char *plusM_other_switches[] = { "Ym", "Ytp", "Ytt", + "Iscs", NULL }; |