Skip to contentSkip to conversation

locking/lockdep: Fix print_collision() unused warning

PATCH New Borislav Petkov 2 participants 2 messages Apr 4, 2016 Locking primitives

lore
Share & tools
lore

Borislav Petkov

author
#0 lore raw

PATCH 1/1 locking/lockdep: Fix print_collision() unused warning

From: Borislav Petkov <[email protected]>

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 <[email protected]>
---
 kernel/locking/lockdep.c | 2 ++
 1 file changed, 2 insertions(+)
kernel/locking/lockdep.c +2 -0
index 2324ba5310db..ed9410936a22 100644
@@ -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
Signature · 1 line
2.5.0.rc2.28.g6003e7f
merge bot
#1 lore raw
locking/lockdep: Fix print_collision() unused warning
Commit-ID:  5c8a010c2411729a07cb1b90c09fa978ac0ac6c0
Gitweb:     http://git.kernel.org/tip/5c8a010c2411729a07cb1b90c09fa978ac0ac6c0
Author:     Borislav Petkov <[email protected]>
AuthorDate: Mon, 4 Apr 2016 10:42:07 +0200
Committer:  Ingo Molnar <[email protected]>
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 <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Paul E. McKenney <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Ingo Molnar <[email protected]>
---
 kernel/locking/lockdep.c | 2 ++
 1 file changed, 2 insertions(+)
kernel/locking/lockdep.c +2 -0
index 2324ba5..ed94109 100644
@@ -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