diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-01-30 19:28:36 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-01-30 19:28:36 +0100 |
| commit | 3847b272248a3a4ed70d20392cc0454917f7713b (patch) | |
| tree | 2df5f60ebf35b128bbe7509a878829236c6cfcab /tools/lib/lockdep/preload.c | |
| parent | 5a5375977b721503e4d6b37ab8982902cd2d10b3 (diff) | |
| parent | bb2bc55a694d45cdeda91b6f28ab2adec28125ef (diff) | |
| download | linux-next-3847b272248a3a4ed70d20392cc0454917f7713b.tar.gz linux-next-3847b272248a3a4ed70d20392cc0454917f7713b.zip | |
Merge branch 'sched/urgent' into sched/core
Merge all pending fixes and refresh the tree, before applying new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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); } |