Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60e114d1 authored by Jarek Poplawski's avatar Jarek Poplawski Committed by Linus Torvalds
Browse files

[PATCH] lockdep: debug_locks check after check_chain_key 



In __lock_acquire check_chain_key can turn off debug_locks, so check is
needed to assure proper return code.

Signed-off-by: default avatarJarek Poplawski <jarkao2@o2.pl>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 34173a4a

kernel/lockdep.c

+4 −0
Original line number Diff line number Diff line
@@ -2228,6 +2228,10 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass, 


	curr->lockdep_depth++;

	check_chain_key(curr);

#ifdef CONFIG_DEBUG_LOCKDEP

	if (unlikely(!debug_locks))

		return 0;

#endif

	if (unlikely(curr->lockdep_depth >= MAX_LOCK_DEPTH)) {

		debug_locks_off();

		printk("BUG: MAX_LOCK_DEPTH too low!\n");