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

Commit 2df8b1d6 authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Ingo Molnar
Browse files

lockdep: use WARN() in kernel/lockdep.c 



Use WARN() instead of a printk+WARN_ON() pair; this way the message
becomes part of the warning section for better reporting/collection.

Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent c72f4573

kernel/lockdep.c

+2 −4
Original line number Diff line number Diff line
@@ -1759,11 +1759,10 @@ static void check_chain_key(struct task_struct *curr) 
		hlock = curr->held_locks + i;

		if (chain_key != hlock->prev_chain_key) {

			debug_locks_off();

			printk("hm#1, depth: %u [%u], %016Lx != %016Lx\n",

			WARN(1, "hm#1, depth: %u [%u], %016Lx != %016Lx\n",

				curr->lockdep_depth, i,

				(unsigned long long)chain_key,

				(unsigned long long)hlock->prev_chain_key);

			WARN_ON(1);

			return;

		}

		id = hlock->class_idx - 1;
@@ -1778,11 +1777,10 @@ static void check_chain_key(struct task_struct *curr) 
	}

	if (chain_key != curr->curr_chain_key) {

		debug_locks_off();

		printk("hm#2, depth: %u [%u], %016Lx != %016Lx\n",

		WARN(1, "hm#2, depth: %u [%u], %016Lx != %016Lx\n",

			curr->lockdep_depth, i,

			(unsigned long long)chain_key,

			(unsigned long long)curr->curr_chain_key);

		WARN_ON(1);

	}

#endif

}