Skip to content

Commit

Permalink
Revert "locking/lockdep: Add debug_locks check in __lock_downgrade()"
Browse files Browse the repository at this point in the history
This reverts commit 4a195a0 which was
commit 7149258 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>
  • Loading branch information
Greg Kroah-Hartman committed Apr 27, 2019
1 parent d6b1140 commit 599c8a4
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions kernel/locking/lockdep.c
Original file line number Diff line number Diff line change
Expand Up @@ -3650,9 +3650,6 @@ __lock_set_class(struct lockdep_map *lock, const char *name,
unsigned int depth;
int i;

if (unlikely(!debug_locks))
return 0;

depth = curr->lockdep_depth;
/*
* This function is about (re)setting the class of a held lock,
Expand Down

0 comments on commit 599c8a4

Please sign in to comment.