提交 22eeb8f6 编写于 作者: A Alexander Holler 提交者: Russell King

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: NAlexander Holler <holler@ahsoftware.de>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
上级 6cde6d42
...@@ -650,15 +650,17 @@ static int __init parse_tag_revision(const struct tag *tag) ...@@ -650,15 +650,17 @@ static int __init parse_tag_revision(const struct tag *tag)
__tagtable(ATAG_REVISION, parse_tag_revision); __tagtable(ATAG_REVISION, parse_tag_revision);
#ifndef CONFIG_CMDLINE_FORCE
static int __init parse_tag_cmdline(const struct tag *tag) 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); 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; return 0;
} }
__tagtable(ATAG_CMDLINE, parse_tag_cmdline); __tagtable(ATAG_CMDLINE, parse_tag_cmdline);
#endif /* CONFIG_CMDLINE_FORCE */
/* /*
* Scan the tag table for this tag, and call its parse function. * Scan the tag table for this tag, and call its parse function.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册