diff options
| author | Rickard Green <[email protected]> | 2011-12-01 09:46:56 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-12-01 09:46:56 +0100 |
| commit | 736bd3aa619244786c32c882001604210f846fa4 (patch) | |
| tree | da11794c3c2cef789a51ff861d7e2b1b1b244d82 /erts/emulator/beam/erl_bif_info.c | |
| parent | 40653b86e7812fcbcdc73f2becdfbcc43f8814e7 (diff) | |
| parent | 8781932b3b8769b6f208ac7c00471122ec7dd055 (diff) | |
| download | otp-736bd3aa619244786c32c882001604210f846fa4.tar.gz otp-736bd3aa619244786c32c882001604210f846fa4.tar.bz2 otp-736bd3aa619244786c32c882001604210f846fa4.zip | |
Merge branch 'rickard/rm-common-runq/OTP-9727'
* rickard/rm-common-runq/OTP-9727:
Remove common run-queue in SMP case
Fix scheduler suspend bug
Conflicts:
erts/emulator/beam/erl_init.c
Diffstat (limited to 'erts/emulator/beam/erl_bif_info.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index a79feaebdb..db04fe5a54 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -78,7 +78,6 @@ static char erts_system_version[] = ("Erlang " ERLANG_OTP_RELEASE #ifdef ERTS_SMP " [smp:%beu:%beu]" #endif - " [rq:%beu]" #ifdef USE_THREADS " [async-threads:%d]" #endif @@ -301,7 +300,7 @@ erts_print_system_version(int to, void *arg, Process *c_p) #endif return erts_print(to, arg, erts_system_version #ifdef ERTS_SMP - , total, online, erts_no_run_queues + , total, online #else , 1 #endif |