diff options
author | Jan Kara <jack@suse.cz> | 2015-01-30 10:16:33 +0100 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2015-01-30 10:16:33 +0100 |
commit | 1cd6b7be92016538ea1f2a8e1f955e9b974d93ea (patch) | |
tree | 77ca10be1da7aaf19cde95de0cb9c4bfcde636a0 /tools/lib/lockdep/preload.c | |
parent | a39427007e7ccd83dbb7cd81b18156cebeab4d1e (diff) | |
parent | 14bf61ffe6ac54afcd1e888a4407fe16054483db (diff) |
Merge branch 'for_linus' into for_next
Diffstat (limited to 'tools/lib/lockdep/preload.c')
-rw-r--r-- | tools/lib/lockdep/preload.c | 4 |
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); } |