diff options
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r-- | arch/arm/kernel/setup.c | 2 | ||||
-rw-r--r-- | arch/arm/kernel/unwind.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index c91c77b54dea..122d999bdc7c 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
@@ -593,6 +593,7 @@ static int __init parse_tag_revision(const struct tag *tag) | |||
593 | 593 | ||
594 | __tagtable(ATAG_REVISION, parse_tag_revision); | 594 | __tagtable(ATAG_REVISION, parse_tag_revision); |
595 | 595 | ||
596 | #ifndef CONFIG_CMDLINE_FORCE | ||
596 | static int __init parse_tag_cmdline(const struct tag *tag) | 597 | static int __init parse_tag_cmdline(const struct tag *tag) |
597 | { | 598 | { |
598 | strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE); | 599 | strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE); |
@@ -600,6 +601,7 @@ static int __init parse_tag_cmdline(const struct tag *tag) | |||
600 | } | 601 | } |
601 | 602 | ||
602 | __tagtable(ATAG_CMDLINE, parse_tag_cmdline); | 603 | __tagtable(ATAG_CMDLINE, parse_tag_cmdline); |
604 | #endif /* CONFIG_CMDLINE_FORCE */ | ||
603 | 605 | ||
604 | /* | 606 | /* |
605 | * Scan the tag table for this tag, and call its parse function. | 607 | * Scan the tag table for this tag, and call its parse function. |
diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c index 50292cd9c120..dd81a918c106 100644 --- a/arch/arm/kernel/unwind.c +++ b/arch/arm/kernel/unwind.c | |||
@@ -26,6 +26,7 @@ | |||
26 | * http://infocenter.arm.com/help/topic/com.arm.doc.subset.swdev.abi/index.html | 26 | * http://infocenter.arm.com/help/topic/com.arm.doc.subset.swdev.abi/index.html |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #ifndef __CHECKER__ | ||
29 | #if !defined (__ARM_EABI__) | 30 | #if !defined (__ARM_EABI__) |
30 | #warning Your compiler does not have EABI support. | 31 | #warning Your compiler does not have EABI support. |
31 | #warning ARM unwind is known to compile only with EABI compilers. | 32 | #warning ARM unwind is known to compile only with EABI compilers. |
@@ -34,6 +35,7 @@ | |||
34 | #warning Your compiler is too buggy; it is known to not compile ARM unwind support. | 35 | #warning Your compiler is too buggy; it is known to not compile ARM unwind support. |
35 | #warning Change compiler or disable ARM_UNWIND option. | 36 | #warning Change compiler or disable ARM_UNWIND option. |
36 | #endif | 37 | #endif |
38 | #endif /* __CHECKER__ */ | ||
37 | 39 | ||
38 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
39 | #include <linux/init.h> | 41 | #include <linux/init.h> |