| From 577da9b93378b056215d239ba2216401bfd5a069 Mon Sep 17 00:00:00 2001 |
| From: Marek Vasut <marex@denx.de> |
| Date: Wed, 30 Sep 2015 22:06:46 +0800 |
| Subject: [PATCH 8/9] nios2: Fix unused variable warning |
| |
| Fix the following compiler splat by adding __maybe_unused annotation to |
| the variable. Using this particular annotation has the least ugly impact |
| on the code compared to using ifdeffery. |
| |
| arch/nios2/kernel/setup.c: In function 'nios2_boot_init': |
| arch/nios2/kernel/setup.c:107:7: warning: unused variable 'cmdline_passed' [-Wunused-variable] |
| char cmdline_passed[COMMAND_LINE_SIZE] = { 0, }; |
| ^ |
| |
| Signed-off-by: Marek Vasut <marex@denx.de> |
| Acked-by: Ley Foon Tan <lftan@altera.com> |
| --- |
| arch/nios2/kernel/setup.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c |
| index b101a43d3c5a..a4ff86d58d5c 100644 |
| --- a/arch/nios2/kernel/setup.c |
| +++ b/arch/nios2/kernel/setup.c |
| @@ -104,7 +104,7 @@ asmlinkage void __init nios2_boot_init(unsigned r4, unsigned r5, unsigned r6, |
| unsigned r7) |
| { |
| unsigned dtb_passed = 0; |
| - char cmdline_passed[COMMAND_LINE_SIZE] = { 0, }; |
| + char cmdline_passed[COMMAND_LINE_SIZE] __maybe_unused = { 0, }; |
| |
| #if defined(CONFIG_NIOS2_PASS_CMDLINE) |
| if (r4 == 0x534f494e) { /* r4 is magic NIOS */ |
| -- |
| 2.6.2 |
| |
