From mboxrd@z Thu Jan  1 00:00:00 1970
From: jamie@jamieiles.com (Jamie Iles)
Date: Tue, 11 Jan 2011 23:18:39 +0000
Subject: [PATCH] ARM: Change misleading warning when CONFIG_CMDLINE_FORCE
	is used
In-Reply-To: <1294766953-6889-1-git-send-email-holler@ahsoftware.de>
References: <1294766953-6889-1-git-send-email-holler@ahsoftware.de>
Message-ID: <20110111231839.GD3181@pulham.picochip.com>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

Hi Alexander,

On Tue, Jan 11, 2011 at 06:29:13PM +0100, Alexander Holler wrote:
> When CONFIG_CMDLINE_FORCE is used, the warning
> 
>   Ignoring unrecognised tag 0x54410009
> 
> was displayed. Change this to
> 
>   Ignoring tag cmdline (using the default kernel command line)
> 
> Signed-off-by: Alexander Holler <holler@ahsoftware.de>
> ---
>  arch/arm/kernel/setup.c |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
> index 336f14e..19c0e96 100644
> --- a/arch/arm/kernel/setup.c
> +++ b/arch/arm/kernel/setup.c
> @@ -649,15 +649,19 @@ static int __init parse_tag_revision(const struct tag *tag)
>  
>  __tagtable(ATAG_REVISION, parse_tag_revision);
>  
> -#ifndef CONFIG_CMDLINE_FORCE
>  static int __init parse_tag_cmdline(const struct tag *tag)
>  {
> +#ifndef CONFIG_CMDLINE_FORCE
>  	strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);
> +#else
> +	printk(KERN_WARNING
> +		"Ignoring tag cmdline"
> +		" (using the default kernel command line)\n");
> +#endif /* CONFIG_CMDLINE_FORCE */

For strings in a printk() like this you don't need to split them to keep 
them under 80 characters.  This makes it harder to grep for so it's fine 
(and preferred) to keep this on a single line.

Jamie