aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2012-04-25 13:11:33 +0200
committerErlang/OTP <[email protected]>2012-04-25 13:11:33 +0200
commit8047beffc2de5498e0fcc4f02bb10ef90928e28b (patch)
tree21544b78bbd652b3bf5cbd34b480877f00cebea7
parentc0e8ade45c9258678e489043a5fa40aa7bcee4d4 (diff)
parent2e6bbeeca790b4e1f4c3096be8e045d2c98ca92d (diff)
downloadotp-8047beffc2de5498e0fcc4f02bb10ef90928e28b.tar.gz
otp-8047beffc2de5498e0fcc4f02bb10ef90928e28b.tar.bz2
otp-8047beffc2de5498e0fcc4f02bb10ef90928e28b.zip
Merge branch 'rickard/driver_system_info/OTP-10059' into maint-r15
* rickard/driver_system_info/OTP-10059: Clear number of async threads if no thread support
-rw-r--r--erts/emulator/beam/erl_init.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 8bcba9de15..7bf8d14708 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -794,6 +794,10 @@ early_init(int *argc, char **argv) /*
}
}
+#ifndef USE_THREADS
+ erts_async_max_threads = 0;
+#endif
+
#ifdef ERTS_SMP
no_schedulers = schdlrs;
no_schedulers_online = schdlrs_onln;