* [patch 2/4] lock validator: fix compile warnings in lockdep.c
@ 2006-06-23 13:25 Heiko Carstens
2006-06-23 13:38 ` Ingo Molnar
0 siblings, 1 reply; 2+ messages in thread
From: Heiko Carstens @ 2006-06-23 13:25 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, Arjan van de Ven, Ingo Molnar
From: Heiko Carstens <heiko.carstens@de.ibm.com>
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@elte.hu>
Cc: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---
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
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [patch 2/4] lock validator: fix compile warnings in lockdep.c
2006-06-23 13:25 [patch 2/4] lock validator: fix compile warnings in lockdep.c Heiko Carstens
@ 2006-06-23 13:38 ` Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2006-06-23 13:38 UTC (permalink / raw)
To: Heiko Carstens; +Cc: Andrew Morton, linux-kernel, Arjan van de Ven
* Heiko Carstens <heiko.carstens@de.ibm.com> wrote:
> From: Heiko Carstens <heiko.carstens@de.ibm.com>
>
> 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@elte.hu>
> Cc: Arjan van de Ven <arjan@infradead.org>
> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
Ingo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-06-23 14:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-06-23 13:25 [patch 2/4] lock validator: fix compile warnings in lockdep.c Heiko Carstens
2006-06-23 13:38 ` Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®