aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-11-06 10:30:48 +0100
committerMarcus Arendt <[email protected]>2014-11-06 10:30:48 +0100
commit6aefe74c0de57e2f5d873b6658396b106aff4f75 (patch)
tree63d8cf293e2509d3241a6d76dd094cbda24ffc8e
parentab85b24eb23a9940eb9e0b8b865a8b34c61d7bf2 (diff)
parent1e5eb4314301e33a105a0ff1f860d9d290ea2618 (diff)
downloadotp-6aefe74c0de57e2f5d873b6658396b106aff4f75.tar.gz
otp-6aefe74c0de57e2f5d873b6658396b106aff4f75.tar.bz2
otp-6aefe74c0de57e2f5d873b6658396b106aff4f75.zip
Merge branch 'vinoski/fix-smp-disable-with-ds/OTP-12295' into maint
* vinoski/fix-smp-disable-with-ds/OTP-12295: Fix "-smp disable" for emulator with dirty schedulers
-rw-r--r--erts/emulator/beam/erl_bif_info.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 61e4469600..0a8f0b5758 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -90,7 +90,7 @@ static char erts_system_version[] = ("Erlang/OTP " ERLANG_OTP_RELEASE
" [smp:%beu:%beu]"
#endif
#ifdef USE_THREADS
-#ifdef ERTS_DIRTY_SCHEDULERS
+#if defined(ERTS_DIRTY_SCHEDULERS) && defined(ERTS_SMP)
" [ds:%beu:%beu:%beu]"
#endif
" [async-threads:%d]"