diff options
| author | Sverker Eriksson <[email protected]> | 2019-03-25 18:24:04 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2019-03-25 18:24:04 +0100 |
| commit | a2b406898cb38b1bf1e812ec87349ee0cd3866ed (patch) | |
| tree | d6a7e172988859d0dae941fc55978ddbc6b5c101 /erts/emulator/beam | |
| parent | 2e6166dbef6af554e623f8ddc59abc126f50c584 (diff) | |
| parent | 2615586202df20dbd1ee05b0feef162ad31d6db0 (diff) | |
| download | otp-a2b406898cb38b1bf1e812ec87349ee0cd3866ed.tar.gz otp-a2b406898cb38b1bf1e812ec87349ee0cd3866ed.tar.bz2 otp-a2b406898cb38b1bf1e812ec87349ee0cd3866ed.zip | |
Merge branch 'sverker/bug-fixing'
* sverker/bug-fixing:
erts: Fix erts_debug:set_internal_state(reds_left)
erts: Fix binary_SUITE:cmp_old_impl
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 504aa8f943..a7424bbcb8 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -4442,6 +4442,7 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2) BIF_P->fcalls = reds; else BIF_P->fcalls = reds - CONTEXT_REDS; + BIF_P->scheduler_data->virtual_reds = 0; } BIF_RET(am_true); } |