mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: lockdep: Fix wrong assumption in match_held_lock
This commit is contained in:
commit
2da9f365fc
1 changed files with 7 additions and 1 deletions
|
@ -3111,7 +3111,13 @@ static int match_held_lock(struct held_lock *hlock, struct lockdep_map *lock)
|
|||
if (!class)
|
||||
class = look_up_lock_class(lock, 0);
|
||||
|
||||
if (DEBUG_LOCKS_WARN_ON(!class))
|
||||
/*
|
||||
* If look_up_lock_class() failed to find a class, we're trying
|
||||
* to test if we hold a lock that has never yet been acquired.
|
||||
* Clearly if the lock hasn't been acquired _ever_, we're not
|
||||
* holding it either, so report failure.
|
||||
*/
|
||||
if (!class)
|
||||
return 0;
|
||||
|
||||
if (DEBUG_LOCKS_WARN_ON(!hlock->nest_lock))
|
||||
|
|
Loading…
Reference in a new issue