[tip:locking/urgent] locking/lockdep: Fix print_collision() unused warning

From: tip-bot for Borislav Petkov
Date: Mon Apr 04 2016 - 06:01:51 EST


Commit-ID: 5c8a010c2411729a07cb1b90c09fa978ac0ac6c0
Gitweb: http://git.kernel.org/tip/5c8a010c2411729a07cb1b90c09fa978ac0ac6c0
Author: Borislav Petkov <bp@xxxxxxx>
AuthorDate: Mon, 4 Apr 2016 10:42:07 +0200
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Mon, 4 Apr 2016 11:41:34 +0200

locking/lockdep: Fix print_collision() unused warning

Fix this:

kernel/locking/lockdep.c:2051:13: warning: âprint_collisionâ defined but not used [-Wunused-function]
static void print_collision(struct task_struct *curr,
^

Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/1459759327-2880-1-git-send-email-bp@xxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
kernel/locking/lockdep.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 2324ba5..ed94109 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -1999,6 +1999,7 @@ static inline int get_first_held_lock(struct task_struct *curr,
return ++i;
}

+#ifdef CONFIG_DEBUG_LOCKDEP
/*
* Returns the next chain_key iteration
*/
@@ -2069,6 +2070,7 @@ static void print_collision(struct task_struct *curr,
printk("\nstack backtrace:\n");
dump_stack();
}
+#endif

/*
* Checks whether the chain and the current held locks are consistent