diff options
| author | Rickard Green <[email protected]> | 2011-11-30 13:59:10 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-11-30 13:59:10 +0100 |
| commit | 9b4bc065ba9fb47a9573d5e11f306452a65df3f1 (patch) | |
| tree | 959a9895530ad64a626996cfb09d25f3f658e8dd /erts/emulator/beam/erl_process_lock.c | |
| parent | 81f08713ff0ea3e49c2432e489a74f49ab6ebc42 (diff) | |
| parent | a8ecde4e398942260153d8b2f37344af259b1007 (diff) | |
| download | otp-9b4bc065ba9fb47a9573d5e11f306452a65df3f1.tar.gz otp-9b4bc065ba9fb47a9573d5e11f306452a65df3f1.tar.bz2 otp-9b4bc065ba9fb47a9573d5e11f306452a65df3f1.zip | |
Merge branch 'rickard/pix-mutex/OTP-9723'
* rickard/pix-mutex/OTP-9723:
Fix warning when lock-checker is enabled
Replace spinlock with mutex as pix_lock implementation
Diffstat (limited to 'erts/emulator/beam/erl_process_lock.c')
| -rw-r--r-- | erts/emulator/beam/erl_process_lock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_process_lock.c b/erts/emulator/beam/erl_process_lock.c index b4d20480c5..a5a753b798 100644 --- a/erts/emulator/beam/erl_process_lock.c +++ b/erts/emulator/beam/erl_process_lock.c @@ -123,10 +123,10 @@ erts_init_proc_lock(int cpus) erts_smp_spinlock_init(&qs_lock, "proc_lck_qs_alloc"); for (i = 0; i < ERTS_NO_OF_PIX_LOCKS; i++) { #ifdef ERTS_ENABLE_LOCK_COUNT - erts_smp_spinlock_init_x(&erts_pix_locks[i].u.spnlck, - "pix_lock", make_small(i)); + erts_mtx_init_x(&erts_pix_locks[i].u.mtx, + "pix_lock", make_small(i)); #else - erts_smp_spinlock_init(&erts_pix_locks[i].u.spnlck, "pix_lock"); + erts_mtx_init(&erts_pix_locks[i].u.mtx, "pix_lock"); #endif } queue_free_list = NULL; |