[patch 2/4] lock validator: fix compile warnings in lockdep.c

From: Heiko Carstens
Date: Fri Jun 23 2006 - 09:24:30 EST


From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>

Fix a few compile warnings on 64 bit machines:

kernel/lockdep.c: In function 'check_chain_key':
kernel/lockdep.c:1399:
warning: format '%016Lx' expects type 'long long unsigned int',
but argument 4 has type 'u64'
kernel/lockdep.c:1399:
warning: format '%016Lx' expects type 'long long unsigned int',
but argument 5 has type 'u64'
...

Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxx>
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
---

kernel/lockdep.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

Index: linux-2.6.17-mm1/kernel/lockdep.c
===================================================================
--- linux-2.6.17-mm1.orig/kernel/lockdep.c
+++ linux-2.6.17-mm1/kernel/lockdep.c
@@ -1395,8 +1395,9 @@ static void check_chain_key(struct task_
if (chain_key != hlock->prev_chain_key) {
debug_locks_off();
printk("hm#1, depth: %u [%u], %016Lx != %016Lx\n",
- curr->lockdep_depth, i, chain_key,
- hlock->prev_chain_key);
+ curr->lockdep_depth, i,
+ (unsigned long long)chain_key,
+ (unsigned long long)hlock->prev_chain_key);
WARN_ON(1);
return;
}
@@ -1411,8 +1412,9 @@ static void check_chain_key(struct task_
if (chain_key != curr->curr_chain_key) {
debug_locks_off();
printk("hm#2, depth: %u [%u], %016Lx != %016Lx\n",
- curr->lockdep_depth, i, chain_key,
- curr->curr_chain_key);
+ curr->lockdep_depth, i,
+ (unsigned long long)chain_key,
+ (unsigned long long)curr->curr_chain_key);
WARN_ON(1);
}
#endif
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/