aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2011-12-02 14:39:53 +0100
committerBjörn Gustavsson <[email protected]>2011-12-02 14:48:47 +0100
commit7bd9c1f9a68a024958040fe5b77dacc73bb6c5ab (patch)
treecfbc4e6cc990db11614cc8c1e5a025b522b45c13
parent0ea7684efdc443a9a4e2b35c97c7eee1b047fc44 (diff)
downloadotp-7bd9c1f9a68a024958040fe5b77dacc73bb6c5ab.tar.gz
otp-7bd9c1f9a68a024958040fe5b77dacc73bb6c5ab.tar.bz2
otp-7bd9c1f9a68a024958040fe5b77dacc73bb6c5ab.zip
Mend the non-SMP emulator
Commit 8781932b3b8769b6f208ac7c00471122ec7dd055 broke erlang:system_info(system_version) in the non-SMP emulator so that it would typically dump core. "rq:%d" was removed from the format string for erts_printf(), but the corresponding argument in the argument list was not removed, which ultimately caused "kernel-poll:%s" to be passed an integer (typically 0).
-rw-r--r--erts/emulator/beam/erl_bif_info.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index db04fe5a54..cb918fd34c 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -301,8 +301,6 @@ erts_print_system_version(int to, void *arg, Process *c_p)
return erts_print(to, arg, erts_system_version
#ifdef ERTS_SMP
, total, online
-#else
- , 1
#endif
#ifdef USE_THREADS
, erts_async_max_threads