The patch titled
lock validator: fix compile warnings in lockdep.c
has been removed from the -mm tree. Its filename is
lock-validator-core-lock-validator-fix-compile-warnings-in-lockdepc.patch
This patch was dropped because lockdep is being redone
------------------------------------------------------
Subject: lock validator: fix compile warnings in lockdep.c
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'
...
Acked-by: Ingo Molnar <mingo@xxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxx>
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
kernel/lockdep.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff -puN kernel/lockdep.c~lock-validator-core-lock-validator-fix-compile-warnings-in-lockdepc kernel/lockdep.c
--- a/kernel/lockdep.c~lock-validator-core-lock-validator-fix-compile-warnings-in-lockdepc
+++ a/kernel/lockdep.c
@@ -1391,8 +1391,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;
}
@@ -1407,8 +1408,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
_
Patches currently in -mm which might be from heiko.carstens@xxxxxxxxxx are
origin.patch
git-klibc.patch
git-s390.patch
zoned-vm-counters-create-vmstatc-h-from-page_allocc-h-s390-fix.patch
s390-move-var-declarations-behind-ifdef.patch
fix-oddball-boolean-logic-in-s390-netiucv.patch
s390-broken-null-test-in-claw-driver.patch
cpu-hotplug-fix-cpu_up_cancel-handling.patch
s390-setupc-cleanup-build-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
