aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/common/erlexec.c
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-11-25 09:06:53 +0100
committerRickard Green <[email protected]>2013-11-25 09:06:53 +0100
commitf01eb9919311c6566d38c50625518d1b68aca73c (patch)
tree8eacc64cdad1f73e3f7816095f90274f4fc7a217 /erts/etc/common/erlexec.c
parent85266798ccd3a55361aa2ffa5c587d4c3f8cc3ae (diff)
parente6b3e1499677fa0aff83e0416ea9a58ffab95210 (diff)
downloadotp-f01eb9919311c6566d38c50625518d1b68aca73c.tar.gz
otp-f01eb9919311c6566d38c50625518d1b68aca73c.tar.bz2
otp-f01eb9919311c6566d38c50625518d1b68aca73c.zip
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/common/erlexec.c')
-rw-r--r--erts/etc/common/erlexec.c4
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",