diff options
| author | Erlang/OTP <[email protected]> | 2012-04-25 13:11:31 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2012-04-25 13:11:31 +0200 |
| commit | 269c223d7bdf194cc3ea25d792328d8b502d4655 (patch) | |
| tree | 699f7cc5dd337eee5d07b7689f8cff29c90b748d /erts/etc/common | |
| parent | 8629cdc77a00384ae4197e7f135285c8efa2c9f3 (diff) | |
| parent | 447eecd1af7ba3e3a46098d93b88964c0f71ca41 (diff) | |
| download | otp-269c223d7bdf194cc3ea25d792328d8b502d4655.tar.gz otp-269c223d7bdf194cc3ea25d792328d8b502d4655.tar.bz2 otp-269c223d7bdf194cc3ea25d792328d8b502d4655.zip | |
Merge branch 'rickard/sched-busy-wait/OTP-10044' into maint-r15
* rickard/sched-busy-wait/OTP-10044:
Add switch controlling scheduler busy wait
Conflicts:
erts/emulator/beam/erl_process.c
erts/emulator/beam/erl_process.h
Diffstat (limited to 'erts/etc/common')
| -rw-r--r-- | erts/etc/common/erlexec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c index 56428e889b..c9aee16def 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -121,6 +121,7 @@ static char *plusM_other_switches[] = { /* +s arguments with values */ static char *pluss_val_switches[] = { "bt", + "bwt", "cl", "ct", "wt", |