Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1370456 > unrolled thread
| Started by | Borislav Petkov <bp@alien8.de> |
|---|---|
| First post | 2016-04-04 10:50 +0200 |
| Last post | 2016-04-04 12:10 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] locking/lockdep: Fix print_collision() unused warning Borislav Petkov <bp@alien8.de> - 2016-04-04 10:50 +0200
[tip:locking/urgent] locking/lockdep: Fix print_collision() unused warning tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-04-04 12:10 +0200
| From | Borislav Petkov <bp@alien8.de> |
|---|---|
| Date | 2016-04-04 10:50 +0200 |
| Subject | [PATCH] locking/lockdep: Fix print_collision() unused warning |
| Message-ID | <rk8mS-qn-1@gated-at.bofh.it> |
From: Borislav Petkov <bp@suse.de>
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@suse.de>
---
kernel/locking/lockdep.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 2324ba5310db..ed9410936a22 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
--
2.5.0.rc2.28.g6003e7f
[toc] | [next] | [standalone]
| From | tip-bot for Borislav Petkov <tipbot@zytor.com> |
|---|---|
| Date | 2016-04-04 12:10 +0200 |
| Subject | [tip:locking/urgent] locking/lockdep: Fix print_collision() unused warning |
| Message-ID | <rk9Cj-1sf-11@gated-at.bofh.it> |
| In reply to | #1370456 |
Commit-ID: 5c8a010c2411729a07cb1b90c09fa978ac0ac6c0
Gitweb: http://git.kernel.org/tip/5c8a010c2411729a07cb1b90c09fa978ac0ac6c0
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Mon, 4 Apr 2016 10:42:07 +0200
Committer: Ingo Molnar <mingo@kernel.org>
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@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1459759327-2880-1-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web