| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-25 08:00:43 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-27 07:34:47 (GMT) |
| commit | 7f21387276e70f7ef2cdfe631c9c53b589ad8a47 (patch) | |
| tree | ac5393d67d214d2ec7aabbf61017fefbaba85eab | |
| parent | 981a4798b5c41d02989c29edc3ff6ddca5ecc404 (diff) | |
| download | common-7f21387276e70f7ef2cdfe631c9c53b589ad8a47.zip common-7f21387276e70f7ef2cdfe631c9c53b589ad8a47.tar.gz common-7f21387276e70f7ef2cdfe631c9c53b589ad8a47.tar.bz2 | |
Revert "locking/lockdep: Add debug_locks check in __lock_downgrade()"
This reverts commit 670d934a1ea178d7543e6f50b515c76cebeb2fcf which was
commit 71492580571467fb7177aade19c18ce7486267f5 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>
| -rw-r--r-- | kernel/locking/lockdep.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index d5b779d..26fc428 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -3446,9 +3446,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, |