aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/common
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2012-04-23 11:58:24 +0200
committerRickard Green <[email protected]>2012-04-23 11:58:24 +0200
commit8bd345f482fc818c2e3fe4b28e146c5fb9c7ba20 (patch)
tree1c991442a54585464b0954744aea3ec7800276f2 /erts/etc/common
parentcfea5eea406ba3af96588ff458e55de9a149d9c5 (diff)
parentb74e9a3d03d685345a8fa592b033a9d691e6e7c0 (diff)
downloadotp-8bd345f482fc818c2e3fe4b28e146c5fb9c7ba20.tar.gz
otp-8bd345f482fc818c2e3fe4b28e146c5fb9c7ba20.tar.bz2
otp-8bd345f482fc818c2e3fe4b28e146c5fb9c7ba20.zip
Merge branch 'rickard/sched-wakeup-other/OTP-10033' into rickard/sched-wakeup-other-r15b01/OTP-10033
Conflicts: erts/emulator/beam/erl_process.c erts/vsn.mk
Diffstat (limited to 'erts/etc/common')
-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
};