aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2012-01-31 13:54:36 +0100
committerErlang/OTP <[email protected]>2012-01-31 13:54:36 +0100
commit7e547ba8221e8e63e5afb62e802318b810f8fafb (patch)
tree9173322f952723d6dba36b98ee991640dfb6f291 /erts/etc
parentb55c3d29a3d9efce2ce6548963809fc3b7ab8729 (diff)
parentac7dcc23af68ef5a01ce5ca03ad485595bf5e18b (diff)
downloadotp-7e547ba8221e8e63e5afb62e802318b810f8fafb.tar.gz
otp-7e547ba8221e8e63e5afb62e802318b810f8fafb.tar.bz2
otp-7e547ba8221e8e63e5afb62e802318b810f8fafb.zip
Merge branch 'rickard/sched-compact-load/OTP-9695' into maint-r14
* rickard/sched-compact-load/OTP-9695: Add switch that can disable scheduler compaction of load
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 2bd576d8e8..95cb688b29 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -122,6 +122,7 @@ static char *plusM_other_switches[] = {
/* +s arguments with values */
static char *pluss_val_switches[] = {
"bt",
+ "cl",
"ct",
"wt",
"ss",