Skip to content

Commit

Permalink
Merge branch 'rickard/no-native-atomics-fix/GH-7114/OTP-18563' into m…
Browse files Browse the repository at this point in the history
…aint-25

* rickard/no-native-atomics-fix/GH-7114/OTP-18563:
  [erts] Fix build without native atomics
  • Loading branch information
Erlang/OTP committed Apr 25, 2023
2 parents 558c7ec + f7724c9 commit 7419d0c
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions erts/emulator/beam/erl_process_lock.h
Expand Up @@ -991,6 +991,7 @@ erts_proc_lock_wait_until_released(Process *p, ErtsProcLocks locks)
#if ERTS_PROC_LOCK_OWN_IMPL
#if !ERTS_PROC_LOCK_ATOMIC_IMPL
Uint32 was_locked;
erts_pix_lock_t *pix_lck = ERTS_PID2PIXLOCK(p->common.id);
erts_pix_lock(pix_lck);
was_locked = (ERTS_PROC_LOCK_FLGS_READ_(&p->lock) & locks);
erts_pix_unlock(pix_lck);
Expand Down

0 comments on commit 7419d0c

Please sign in to comment.