Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22eeb8f6 authored by Alexander Holler's avatar Alexander Holler Committed by Russell King
Browse files

ARM: 6620/1: Change misleading warning when CONFIG_CMDLINE_FORCE is used 



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: default avatarAlexander Holler <holler@ahsoftware.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 6cde6d42

arch/arm/kernel/setup.c

+4 −2
Original line number Diff line number Diff line
@@ -650,15 +650,17 @@ 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

	pr_warning("Ignoring tag cmdline (using the default kernel command line)\n");

#endif /* CONFIG_CMDLINE_FORCE */

	return 0;

}



__tagtable(ATAG_CMDLINE, parse_tag_cmdline);

#endif /* CONFIG_CMDLINE_FORCE */



/*

 * Scan the tag table for this tag, and call its parse function.