summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-01-11 09:18:05 +0100
committerIngo Molnar <mingo@kernel.org>2015-01-11 09:18:05 +0100
commit8e654dd68f95ac5f990ed21b2b31967dacbe563f (patch)
tree1b977975b072a8e9485c387869334e2b44e7f296 /tools
parenta63b03e2d2477586440741677ecac45bcf28d7b1 (diff)
parent84dccbee2fb9cce9d58665aa461f905835e75038 (diff)
downloadlinux-8e654dd68f95ac5f990ed21b2b31967dacbe563f.tar.gz
linux-8e654dd68f95ac5f990ed21b2b31967dacbe563f.tar.bz2
linux-8e654dd68f95ac5f990ed21b2b31967dacbe563f.zip
Merge branch 'core/urgent' into locking/urgent, to collect all pending locking fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/lib/lockdep/preload.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/lib/lockdep/preload.c b/tools/lib/lockdep/preload.c
index 6f803609e498..0b0112c80f22 100644
--- a/tools/lib/lockdep/preload.c
+++ b/tools/lib/lockdep/preload.c
@@ -317,7 +317,7 @@ int pthread_mutex_destroy(pthread_mutex_t *mutex)
*
* TODO: Hook into free() and add that check there as well.
*/
- debug_check_no_locks_freed(mutex, mutex + sizeof(*mutex));
+ debug_check_no_locks_freed(mutex, sizeof(*mutex));
__del_lock(__get_lock(mutex));
return ll_pthread_mutex_destroy(mutex);
}
@@ -341,7 +341,7 @@ int pthread_rwlock_destroy(pthread_rwlock_t *rwlock)
{
try_init_preload();
- debug_check_no_locks_freed(rwlock, rwlock + sizeof(*rwlock));
+ debug_check_no_locks_freed(rwlock, sizeof(*rwlock));
__del_lock(__get_lock(rwlock));
return ll_pthread_rwlock_destroy(rwlock);
}