From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753935AbbFCJcO (ORCPT ); Wed, 3 Jun 2015 05:32:14 -0400 Received: from terminus.zytor.com ([198.137.202.10]:58862 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753445AbbFCJbz (ORCPT ); Wed, 3 Jun 2015 05:31:55 -0400 Date: Wed, 3 Jun 2015 02:30:39 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: linux-kernel@vger.kernel.org, bp@alien8.de, torvalds@linux-foundation.org, bp@suse.de, akpm@linux-foundation.org, a.p.zijlstra@chello.nl, mingo@kernel.org, tglx@linutronix.de, peterz@infradead.org, hpa@zytor.com, paulmck@linux.vnet.ibm.com Reply-To: paulmck@linux.vnet.ibm.com, hpa@zytor.com, peterz@infradead.org, tglx@linutronix.de, a.p.zijlstra@chello.nl, mingo@kernel.org, akpm@linux-foundation.org, bp@suse.de, torvalds@linux-foundation.org, bp@alien8.de, linux-kernel@vger.kernel.org In-Reply-To: <20150602133827.GD19887@pd.tnic> References: <20150602133827.GD19887@pd.tnic> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/core] lockdep: Do not break user-visible string Git-Commit-ID: 92ae18371cb1abb4e186dd9d48de2bb0d9bba626 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: 92ae18371cb1abb4e186dd9d48de2bb0d9bba626 Gitweb: http://git.kernel.org/tip/92ae18371cb1abb4e186dd9d48de2bb0d9bba626 Author: Borislav Petkov AuthorDate: Tue, 2 Jun 2015 15:38:27 +0200 Committer: Ingo Molnar CommitDate: Wed, 3 Jun 2015 10:07:09 +0200 lockdep: Do not break user-visible string Remove the line-break in the user-visible string and add the missing space in this error message: WARNING: lockdep init error! lock-(console_sem).lock was acquiredbefore lockdep_init Also: - don't yell, it's just a debug warning - denote references to function calls with '()' - standardize the lock name quoting - and finish the sentence. The result: WARNING: lockdep init error: lock '(console_sem).lock' was acquired before lockdep_init(). Signed-off-by: Borislav Petkov Cc: Andrew Morton Cc: Linus Torvalds Cc: Paul E. McKenney Cc: Peter Zijlstra Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20150602133827.GD19887@pd.tnic [ Added a few more stylistic tweaks to the error message. ] Signed-off-by: Ingo Molnar Signed-off-by: Ingo Molnar --- kernel/locking/lockdep.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index a0831e1..a61bb1d3 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -4066,8 +4066,7 @@ void __init lockdep_info(void) #ifdef CONFIG_DEBUG_LOCKDEP if (lockdep_init_error) { - printk("WARNING: lockdep init error! lock-%s was acquired" - "before lockdep_init\n", lock_init_error); + printk("WARNING: lockdep init error: lock '%s' was acquired before lockdep_init().\n", lock_init_error); printk("Call stack leading to lockdep invocation was:\n"); print_stack_trace(&lockdep_init_trace, 0); }