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

[tip-bot for Borislav Petkov]

Commit-ID:  5c8a010c2411729a07cb1b90c09fa978ac0ac6c0
Gitweb: http://git.kernel.org/tip/5c8a010c2411729a07cb1b90c09fa978ac0ac6c0
Author: Borislav Petkov 
AuthorDate: Mon, 4 Apr 2016 10:42:07 +0200
Committer:  Ingo Molnar 
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 
Cc: Andrew Morton 
Cc: Linus Torvalds 
Cc: Paul E. McKenney 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: http://lkml.kernel.org/r/1459759327-2880-1-git-send-email...@alien8.de
Signed-off-by: Ingo Molnar 
---
 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

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

[tip-bot for Borislav Petkov]

Commit-ID:  5c8a010c2411729a07cb1b90c09fa978ac0ac6c0
Gitweb: http://git.kernel.org/tip/5c8a010c2411729a07cb1b90c09fa978ac0ac6c0
Author: Borislav Petkov 
AuthorDate: Mon, 4 Apr 2016 10:42:07 +0200
Committer:  Ingo Molnar 
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 
Cc: Andrew Morton 
Cc: Linus Torvalds 
Cc: Paul E. McKenney 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: http://lkml.kernel.org/r/1459759327-2880-1-git-send-email...@alien8.de
Signed-off-by: Ingo Molnar 
---
 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