aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-09-11 15:15:22 +0200
committerLukas Larsson <[email protected]>2017-09-11 15:15:22 +0200
commit7cbd315c3feccbfd67d369a79f299d62035a2c57 (patch)
tree0330d86d6fb47fa13195e412319a7ec63efb5d5a /erts/etc
parentb69fd5aa4daf4f6d2e78dde48d38fc4e34b0278c (diff)
downloadotp-7cbd315c3feccbfd67d369a79f299d62035a2c57.tar.gz
otp-7cbd315c3feccbfd67d369a79f299d62035a2c57.tar.bz2
otp-7cbd315c3feccbfd67d369a79f299d62035a2c57.zip
erts: non-smp removal cleanup in erlexec
Diffstat (limited to 'erts/etc')
-rw-r--r--erts/etc/common/erlexec.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 55a55b658c..6b194e25da 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -237,7 +237,7 @@ static int verbose = 0; /* If non-zero, print some extra information. */
static int start_detached = 0; /* If non-zero, the emulator should be
* started detached (in the background).
*/
-static int start_smp_emu = 0; /* Start the smp emulator. */
+static int start_smp_emu = 1; /* Start the smp emulator. */
static const char* emu_type = 0; /* Type of emulator (lcnt, valgrind, etc) */
#ifdef __WIN32__
@@ -460,8 +460,6 @@ int main(int argc, char **argv)
* Construct the path of the executable.
*/
cpuinfo = erts_cpu_info_create();
- /* '-smp auto' is default */
- start_smp_emu = 1;
#if defined(__WIN32__) && defined(WIN32_ALWAYS_DEBUG)
emu_type = "debug";
@@ -1140,10 +1138,6 @@ usage_aux(void)
#ifdef __WIN32__
"[-start_erl [datafile]] "
#endif
- "[-smp [auto"
- "|enable"
- "]"
- "] "
"[-make] [-man [manopts] MANPAGE] [-x] [-emu_args] [-start_epmd BOOLEAN] "
"[-args_file FILENAME] [+A THREADS] [+a SIZE] [+B[c|d|i]] [+c [BOOLEAN]] "
"[+C MODE] [+h HEAP_SIZE_OPTION] [+K BOOLEAN] "