adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Arjan van de Ven 2008-07-30 12:43:11 -07:00 committed by Ingo Molnar
parent c72f4573a5
commit 2df8b1d656
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kernel/lockdep.c
View file

@ -1759,11 +1759,10 @@ static void check_chain_key(struct task_struct *curr)
hlock = curr->held_locks + i; hlock = curr->held_locks + i;
if (chain_key != hlock->prev_chain_key) { if (chain_key != hlock->prev_chain_key) {
debug_locks_off(); 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, curr->lockdep_depth, i,
(unsigned long long)chain_key, (unsigned long long)chain_key,
(unsigned long long)hlock->prev_chain_key); (unsigned long long)hlock->prev_chain_key);
WARN_ON(1);
return; return;
} }
id = hlock->class_idx - 1; 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) { if (chain_key != curr->curr_chain_key) {
debug_locks_off(); 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, curr->lockdep_depth, i,
(unsigned long long)chain_key, (unsigned long long)chain_key,
(unsigned long long)curr->curr_chain_key); (unsigned long long)curr->curr_chain_key);
WARN_ON(1);
} }
#endif #endif
} }