diff options
| author | Rickard Green <rickard@erlang.org> | 2013-11-25 09:06:53 +0100 |
|---|---|---|
| committer | Rickard Green <rickard@erlang.org> | 2013-11-25 09:06:53 +0100 |
| commit | f01eb9919311c6566d38c50625518d1b68aca73c (patch) | |
| tree | 8eacc64cdad1f73e3f7816095f90274f4fc7a217 /erts/etc | |
| parent | 85266798ccd3a55361aa2ffa5c587d4c3f8cc3ae (diff) | |
| parent | e6b3e1499677fa0aff83e0416ea9a58ffab95210 (diff) | |
| download | erlang-f01eb9919311c6566d38c50625518d1b68aca73c.tar.gz | |
Merge branch 'maint'
* maint:
Fix observer retrieval of alloc info
Fix documentation of the +MMsco switch
Replace the +MMscmgc switch with +MMscrfsd
Add switch for disabling sys_alloc carriers
Add support for locking mappings to physical memory
Diffstat (limited to 'erts/etc')
| -rw-r--r-- | erts/etc/common/erlexec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c index f212502bb0..00540662fe 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -103,14 +103,16 @@ static char *plusM_other_switches[] = { "ea", "ummc", "uycs", + "usac", "im", "is", "it", + "lpm", "Mamcbf", "Mrmcbf", "Mmcs", "Mscs", - "Mscmgc", + "Mscrfsd", "Msco", "Mscrpm", "Ye", |