diff options
Diffstat (limited to 'arch/arm/kernel/setup.c')
-rw-r--r-- | arch/arm/kernel/setup.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 3455ad33de4c..7c54e115055b 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
@@ -650,15 +650,17 @@ static int __init parse_tag_revision(const struct tag *tag) | |||
650 | 650 | ||
651 | __tagtable(ATAG_REVISION, parse_tag_revision); | 651 | __tagtable(ATAG_REVISION, parse_tag_revision); |
652 | 652 | ||
653 | #ifndef CONFIG_CMDLINE_FORCE | ||
654 | static int __init parse_tag_cmdline(const struct tag *tag) | 653 | static int __init parse_tag_cmdline(const struct tag *tag) |
655 | { | 654 | { |
655 | #ifndef CONFIG_CMDLINE_FORCE | ||
656 | strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE); | 656 | strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE); |
657 | #else | ||
658 | pr_warning("Ignoring tag cmdline (using the default kernel command line)\n"); | ||
659 | #endif /* CONFIG_CMDLINE_FORCE */ | ||
657 | return 0; | 660 | return 0; |
658 | } | 661 | } |
659 | 662 | ||
660 | __tagtable(ATAG_CMDLINE, parse_tag_cmdline); | 663 | __tagtable(ATAG_CMDLINE, parse_tag_cmdline); |
661 | #endif /* CONFIG_CMDLINE_FORCE */ | ||
662 | 664 | ||
663 | /* | 665 | /* |
664 | * Scan the tag table for this tag, and call its parse function. | 666 | * Scan the tag table for this tag, and call its parse function. |