diff options
| author | Lukas Larsson <[email protected]> | 2013-02-21 14:13:24 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-02-21 14:13:24 +0100 |
| commit | 101a67bfafb4db55ae8ed761cf33c09c9ead4797 (patch) | |
| tree | f5893ae5b90219fcffeb150cbc8fce38672640fb /erts | |
| parent | 9dcbf5234b7e6dcb9adbaf0db062a5ac74ba6818 (diff) | |
| parent | 072d1475680ac70827556cf87b8ef7ce1bfbc0c8 (diff) | |
| download | otp-101a67bfafb4db55ae8ed761cf33c09c9ead4797.tar.gz otp-101a67bfafb4db55ae8ed761cf33c09c9ead4797.tar.bz2 otp-101a67bfafb4db55ae8ed761cf33c09c9ead4797.zip | |
Merge branch 'lukas/erts/fix_non_smp_shell_sws/OTP-10661'
* lukas/erts/fix_non_smp_shell_sws/OTP-10661:
Fix bug where +sws proposal was still allowed to be set
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index 96af19fb83..00247b387a 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -4311,8 +4311,7 @@ erts_sched_set_wakeup_other_type(char *str) wakeup_other.type = type; return 0; #else - if (sys_strcmp(str, "proposal") == 0 || sys_strcmp(str, "default") == 0 || - sys_strcmp(str, "legacy") == 0) { + if (sys_strcmp(str, "default") == 0 || sys_strcmp(str, "legacy") == 0) { return 0; } return EINVAL; |