Merge branch 'core/urgent' into locking/urgent, to collect all pending locking fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Merge branch 'core/urgent' into locking/urgent, to collect all pending locking fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Ingo Molnar
2 parents a63b03e2d2 84dccbee2f
Showing 1 changed file Side-by-side Diff
tools/lib/lockdep/preload.c
@@ -317,7 +317,7 @@
 	 *
 	 * 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 @@
 {
 	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);
 }
...	...	@@ -317,7 +317,7 @@
317	317	*
318	318	* TODO: Hook into free() and add that check there as well.
319	319	*/
320		- debug_check_no_locks_freed(mutex, mutex + sizeof(*mutex));
	320	+ debug_check_no_locks_freed(mutex, sizeof(*mutex));
321	321	__del_lock(__get_lock(mutex));
322	322	return ll_pthread_mutex_destroy(mutex);
323	323	}
...	...	@@ -341,7 +341,7 @@
341	341	{
342	342	try_init_preload();
343	343
344		- debug_check_no_locks_freed(rwlock, rwlock + sizeof(*rwlock));
	344	+ debug_check_no_locks_freed(rwlock, sizeof(*rwlock));
345	345	__del_lock(__get_lock(rwlock));
346	346	return ll_pthread_rwlock_destroy(rwlock);
347	347	}