diff options
| author | Sverker Eriksson <[email protected]> | 2012-03-30 16:37:47 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-03-30 16:37:47 +0200 |
| commit | d9f0c6d19ed48bfb88ea80c57c83faa845604872 (patch) | |
| tree | cf812b3ce1dab9fa9d64d79969293e18746dda40 /erts | |
| parent | 6e10c9013ed2ba6ff101bcde3736c6952848e687 (diff) | |
| parent | aa257fbe5248a054e3c3b660efe6013d9e52bc70 (diff) | |
| download | otp-d9f0c6d19ed48bfb88ea80c57c83faa845604872.tar.gz otp-d9f0c6d19ed48bfb88ea80c57c83faa845604872.tar.bz2 otp-d9f0c6d19ed48bfb88ea80c57c83faa845604872.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_process_lock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_process_lock.h b/erts/emulator/beam/erl_process_lock.h index 97e554914e..8dbdaccc68 100644 --- a/erts/emulator/beam/erl_process_lock.h +++ b/erts/emulator/beam/erl_process_lock.h @@ -958,8 +958,6 @@ erts_pid2proc_opt(Process *c_p, if (flags & ERTS_P2P_FLG_TRY_LOCK) proc = ERTS_PROC_LOCK_BUSY; else { - if (flags & ERTS_P2P_FLG_SMP_INC_REFC) - proc->lock.refc++; #ifdef ERTS_ENABLE_LOCK_COUNT erts_lcnt_proc_lock_unaquire(&proc->lock, lcnt_locks); #endif @@ -969,6 +967,8 @@ erts_pid2proc_opt(Process *c_p, pid_need_locks, pix_lock, flags); + if (proc && (flags & ERTS_P2P_FLG_SMP_INC_REFC)) + proc->lock.refc++; } } } |