From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755196AbcDDKBt (ORCPT ); Mon, 4 Apr 2016 06:01:49 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57240 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755129AbcDDKBs (ORCPT ); Mon, 4 Apr 2016 06:01:48 -0400 Date: Mon, 4 Apr 2016 03:01:10 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: hpa@zytor.com, paulmck@linux.vnet.ibm.com, peterz@infradead.org, tglx@linutronix.de, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, bp@suse.de, mingo@kernel.org, akpm@linux-foundation.org Reply-To: mingo@kernel.org, bp@suse.de, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, paulmck@linux.vnet.ibm.com, hpa@zytor.com, tglx@linutronix.de, peterz@infradead.org In-Reply-To: <1459759327-2880-1-git-send-email-bp@alien8.de> References: <1459759327-2880-1-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/urgent] locking/lockdep: Fix print_collision() unused warning Git-Commit-ID: 5c8a010c2411729a07cb1b90c09fa978ac0ac6c0 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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-bp@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