raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

Revert "locking/lockdep: Add debug_locks check in __lock_downgrade()"

Browse Source 
This reverts commit 0e0f7b3072 which was
commit 7149258057 upstream.

Tetsuo rightly points out that the backport here is incorrect, as it
touches the __lock_set_class function instead of the intended
__lock_downgrade function.

Reported-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Cc: Waiman Long <longman@redhat.com>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2019-04-25 10:00:43 +02:00
parent 9c18625661
commit ac54bc121e
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/locking/lockdep.c
View File

@@ -3567,9 +3567,6 @@ __lock_set_class(struct lockdep_map *lock, const char *name,
unsigned int depth; unsigned int depth;
int i; int i;
if (unlikely(!debug_locks))
return 0;
depth = curr->lockdep_depth; depth = curr->lockdep_depth;
/* /*
* This function is about (re)setting the class of a held lock, * This function is about (re)setting the class of a held lock,