aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2012-04-25 13:11:28 +0200
committerErlang/OTP <[email protected]>2012-04-25 13:11:28 +0200
commit8629cdc77a00384ae4197e7f135285c8efa2c9f3 (patch)
tree1c991442a54585464b0954744aea3ec7800276f2 /erts/etc
parentfbf025acfb494717c12c096b643652de5f7501dc (diff)
parent8bd345f482fc818c2e3fe4b28e146c5fb9c7ba20 (diff)
downloadotp-8629cdc77a00384ae4197e7f135285c8efa2c9f3.tar.gz
otp-8629cdc77a00384ae4197e7f135285c8efa2c9f3.tar.bz2
otp-8629cdc77a00384ae4197e7f135285c8efa2c9f3.zip
Merge branch 'rickard/sched-wakeup-other-r15b01/OTP-10033' into maint-r15
* rickard/sched-wakeup-other-r15b01/OTP-10033: Implement proposal for new scheduler wakeup strategy
Diffstat (limited to 'erts/etc')
-rw-r--r--erts/etc/common/erlexec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 19b3bb82ef..56428e889b 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -124,6 +124,7 @@ static char *pluss_val_switches[] = {
"cl",
"ct",
"wt",
+ "ws",
"ss",
NULL
};