diff options
| author | Rickard Green <[email protected]> | 2013-11-25 09:05:20 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-11-25 09:05:20 +0100 |
| commit | e6b3e1499677fa0aff83e0416ea9a58ffab95210 (patch) | |
| tree | 9be1684ea3e10c2afbc3176aa0a903ff88a5e10a /erts/etc | |
| parent | bfb832589ea4d5c60db202459beab102768341ff (diff) | |
| parent | 6cd261deb5fec413eb196b620a4618cfa0781458 (diff) | |
| download | otp-e6b3e1499677fa0aff83e0416ea9a58ffab95210.tar.gz otp-e6b3e1499677fa0aff83e0416ea9a58ffab95210.tar.bz2 otp-e6b3e1499677fa0aff83e0416ea9a58ffab95210.zip | |
Merge branch 'rickard/supercarrier-fix/OTP-11149' into maint
* rickard/supercarrier-fix/OTP-11149:
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 c9908caf20..f098e56a2e 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", |