[PATCH] ARM: Change misleading warning when CONFIG_CMDLINE_FORCE is used

STALE5731d

3 messages, 3 authors, 2011-01-11 · open the first message on its own page

[PATCH] ARM: Change misleading warning when CONFIG_CMDLINE_FORCE is used

From: Alexander Holler <hidden>
Date: 2011-01-11 17:29:13

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 <redacted>
---
 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 */
 	return 0;
 }
 
 __tagtable(ATAG_CMDLINE, parse_tag_cmdline);
-#endif /* CONFIG_CMDLINE_FORCE */
 
 /*
  * Scan the tag table for this tag, and call its parse function.

-- 
1.7.3.4

[PATCH] ARM: Change misleading warning when CONFIG_CMDLINE_FORCE is used

From: Jamie Iles <hidden>
Date: 2011-01-11 23:18:39

Hi Alexander,

On Tue, Jan 11, 2011 at 06:29:13PM +0100, Alexander Holler wrote:

quoted hunk

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 <redacted>
---
 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

[PATCH] ARM: Change misleading warning when CONFIG_CMDLINE_FORCE is used

From: Russell King - ARM Linux <hidden>
Date: 2011-01-11 23:28:41

On Tue, Jan 11, 2011 at 06:29:13PM +0100, Alexander Holler wrote:

+#else
+	printk(KERN_WARNING
+		"Ignoring tag cmdline"
+		" (using the default kernel command line)\n");

In addition to Jamey's comment, we do have a set of pr_xxx helpers:

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

which I think is neater.

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help