diff options
| author | Rickard Green <[email protected]> | 2015-12-08 15:11:51 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-12-08 15:11:51 +0100 |
| commit | 40beec43a477062dc81c4dd29eb9dc6a1db0ee9a (patch) | |
| tree | 1695f93aed4ca1760a2b4c94f19e83d119ae3866 /erts/etc/common/erlexec.c | |
| parent | 4b17e3d6585bac8411d8f58d65d05e90156f5664 (diff) | |
| parent | 19c4689eea86f26c5af9b8f712c227ce4f62310b (diff) | |
| download | otp-40beec43a477062dc81c4dd29eb9dc6a1db0ee9a.tar.gz otp-40beec43a477062dc81c4dd29eb9dc6a1db0ee9a.tar.bz2 otp-40beec43a477062dc81c4dd29eb9dc6a1db0ee9a.zip | |
Merge branch 'rickard/ohmq-fixup/OTP-13047'
* rickard/ohmq-fixup/OTP-13047:
Replace off_heap_message_queue option with message_queue_data option
Always use literal_alloc
Distinguish between GC disabled by BIFs and other disabled GC
Fix process_info(_, off_heap_message_queue)
Off heap message queue test suite
Remove unused variable
Fix memory leaks
Diffstat (limited to 'erts/etc/common/erlexec.c')
| -rw-r--r-- | erts/etc/common/erlexec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c index 7b0fe46a01..f21671e837 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -158,7 +158,7 @@ static char *plusr_val_switches[] = { /* +x arguments with values */ static char *plusx_val_switches[] = { - "ohmq", + "mqd", NULL }; |