From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759260AbbFBNim (ORCPT ); Tue, 2 Jun 2015 09:38:42 -0400 Received: from mail.skyhub.de ([78.46.96.112]:35766 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759238AbbFBNie (ORCPT ); Tue, 2 Jun 2015 09:38:34 -0400 Date: Tue, 2 Jun 2015 15:38:27 +0200 From: Borislav Petkov To: Ingo Molnar Cc: Peter Zijlstra , LKML Subject: [PATCH -v1.1] lockdep: Do not break user-visible string Message-ID: <20150602133827.GD19887@pd.tnic> References: <1432918575-30734-1-git-send-email-bp@alien8.de> <20150602115216.GA20524@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20150602115216.GA20524@gmail.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jun 02, 2015 at 01:52:17PM +0200, Ingo Molnar wrote: > Please also fix the cause, not just the symptom: the cause is the unnecessary > line-break in the middle of a user visible string. v1.1: --- From: Borislav Petkov Date: Fri, 29 May 2015 18:49:45 +0200 Subject: [PATCH v1.1] 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 Signed-off-by: Borislav Petkov --- 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 a0831e1b99f4..4f0b995d86a2 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); } -- 2.3.5 -- Regards/Gruss, Boris. ECO tip #101: Trim your mails when you reply. --