diff options
| author | Sverker Eriksson <[email protected]> | 2012-10-05 18:19:46 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-10-05 18:19:46 +0200 |
| commit | 13348e02f5aac5509e3b7ef0ea4142e25c472b1d (patch) | |
| tree | 3d7e416da68dd8299746055e8512ab13fa0d52dd /erts/emulator/beam/beam_load.c | |
| parent | 3761c5caafae68e2c275e5f0b1357172c6951147 (diff) | |
| parent | 52fcc669df315042adb1023c4cb263898af09d0e (diff) | |
| download | otp-13348e02f5aac5509e3b7ef0ea4142e25c472b1d.tar.gz otp-13348e02f5aac5509e3b7ef0ea4142e25c472b1d.tar.bz2 otp-13348e02f5aac5509e3b7ef0ea4142e25c472b1d.zip | |
Merge branch 'sverk/code-load-refactor-later-op'
* sverk/code-load-refactor-later-op:
erts: Fix faulty lock check assert
erts: Refactor naming regarding code_write_permission
erts: Refactor tracing to use erts_schedule_thr_prgr_later_op
erts: Allow thr_prgr_later_op to reschedule
erts: Refactor code loading to use erts_schedule_thr_prgr_later_op
erts: Remove some compiler warnings
Diffstat (limited to 'erts/emulator/beam/beam_load.c')
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index 25ae480dc7..b51f076a5d 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -756,7 +756,7 @@ erts_finish_loading(Binary* magic, Process* c_p, * table which is not protected by any locks. */ - ERTS_SMP_LC_ASSERT(erts_initialized == 0 || erts_is_code_ix_locked() || + ERTS_SMP_LC_ASSERT(erts_initialized == 0 || erts_has_code_write_permission() || erts_smp_thr_progress_is_blocking()); /* |