diff options
| author | Rickard Green <[email protected]> | 2011-11-13 22:07:17 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-11-13 22:07:17 +0100 |
| commit | 0ec27bfa5b1b12d2b3c77c35293dfe592d2b49a8 (patch) | |
| tree | 54d8ac300f5d8a2b6ea8ec471a6e66967ef956bb /erts | |
| parent | 6ff77abac7d54f23e5a5fc465c3746c9cd7ee57b (diff) | |
| parent | 71af43ff97689f8a4edc06dd323f1969b04573ae (diff) | |
| download | otp-0ec27bfa5b1b12d2b3c77c35293dfe592d2b49a8.tar.gz otp-0ec27bfa5b1b12d2b3c77c35293dfe592d2b49a8.tar.bz2 otp-0ec27bfa5b1b12d2b3c77c35293dfe592d2b49a8.zip | |
Merge branch 'rickard/bad-rwmtx-assert'
* rickard/bad-rwmtx-assert:
Fix bad assertion in rwmtx implementation
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/lib_src/common/ethr_mutex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/lib_src/common/ethr_mutex.c b/erts/lib_src/common/ethr_mutex.c index 5688ac8b9a..e363279f2e 100644 --- a/erts/lib_src/common/ethr_mutex.c +++ b/erts/lib_src/common/ethr_mutex.c @@ -2367,7 +2367,7 @@ dbg_unlock_wake(ethr_rwmutex *rwmtx, exp = have_w ? ETHR_RWMTX_W_FLG__ : 0; if (rwmtx->type != ETHR_RWMUTEX_TYPE_NORMAL) - imask = ETHR_RWMTX_R_PEND_UNLCK_MASK__; + imask = ETHR_RWMTX_R_PEND_UNLCK_MASK__|ETHR_RWMTX_R_ABRT_UNLCK_FLG__; else { #ifdef ETHR_RLOCK_WITH_INC_DEC imask = ETHR_RWMTX_RS_MASK__; |