diff options
| author | Rickard Green <[email protected]> | 2013-07-12 14:02:16 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-07-12 14:02:16 +0200 |
| commit | 712f2cad96a941d68a2f9ad092badd5bc60e8cdd (patch) | |
| tree | 06bd3a8a13eaeeb3c4ff62187ec0eaa9e7a31e21 /erts/include | |
| parent | 257f41f238503043aaf92e709f5fc3e7e188a1ac (diff) | |
| parent | bc30159f5eac936fa9c8ea97d2ab11564448ba7b (diff) | |
| download | otp-712f2cad96a941d68a2f9ad092badd5bc60e8cdd.tar.gz otp-712f2cad96a941d68a2f9ad092badd5bc60e8cdd.tar.bz2 otp-712f2cad96a941d68a2f9ad092badd5bc60e8cdd.zip | |
Merge branch 'maint'
* maint:
Fix variable ‘rp_had_locks’ set but not used warning
Fix ‘ethr_native_rwlock_destroy’ defined but not used warning
Fix 'no previous prototype' warning for dtrace functions
Conditionally skip process_SUITE tests that consume large amount of memory
Diffstat (limited to 'erts/include')
| -rw-r--r-- | erts/include/internal/ethread.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/include/internal/ethread.h b/erts/include/internal/ethread.h index ab728c65fa..407097d4b1 100644 --- a/erts/include/internal/ethread.h +++ b/erts/include/internal/ethread.h @@ -411,6 +411,7 @@ extern ethr_runtime_t ethr_runtime__; #ifdef VALGRIND /* mutex as fallback for spinlock for VALGRIND */ # undef ETHR_HAVE_NATIVE_SPINLOCKS +# undef ETHR_HAVE_NATIVE_RWSPINLOCKS #else # include "ethr_optimized_fallbacks.h" #endif @@ -693,7 +694,7 @@ static ETHR_INLINE int ETHR_INLINE_FUNC_NAME_(ethr_rwlock_destroy)(ethr_rwlock_t *lock) { #ifdef ETHR_HAVE_NATIVE_RWSPINLOCKS - return 0; + return ethr_native_rwlock_destroy(lock); #else return ethr_rwmutex_destroy((ethr_rwmutex *) lock); #endif |