diff options
| author | Rickard Green <[email protected]> | 2012-06-20 14:22:19 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-06-20 14:22:19 +0200 |
| commit | 7f66a86b79c29f41ad5c787f014a28bbabcfea06 (patch) | |
| tree | aaa08caba091f9df945a0d99cde08f3241bacdf0 /erts/emulator/beam/beam_bif_load.c | |
| parent | 00dee07f0480994a303e16c803d367c34c2a7f26 (diff) | |
| parent | ba8fb1d9939d070fc67f959a2041d965929fed35 (diff) | |
| download | otp-7f66a86b79c29f41ad5c787f014a28bbabcfea06.tar.gz otp-7f66a86b79c29f41ad5c787f014a28bbabcfea06.tar.bz2 otp-7f66a86b79c29f41ad5c787f014a28bbabcfea06.zip | |
Merge branch 'maint'
* maint:
Fix faulty use of thread progress in handle_aux_work()
Conflicts:
erts/emulator/beam/erl_process.c
Needed modifications:
erts/emulator/beam/beam_bif_load.c
Diffstat (limited to 'erts/emulator/beam/beam_bif_load.c')
| -rw-r--r-- | erts/emulator/beam/beam_bif_load.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c index 4bf1c13421..9c65769b86 100644 --- a/erts/emulator/beam/beam_bif_load.c +++ b/erts/emulator/beam/beam_bif_load.c @@ -361,7 +361,7 @@ staging_epilogue(Process* c_p, int commit, Eterm res, int is_blocking, * without any memory barriers at all. */ - later = erts_thr_progress_later(); + later = erts_thr_progress_later(c_p->scheduler_data); erts_thr_progress_wakeup(c_p->scheduler_data, later); erts_notify_code_ix_activation(c_p, later); erts_suspend(c_p, ERTS_PROC_LOCK_MAIN, NULL); |