aboutsummaryrefslogtreecommitdiffstats
path: root/arch/nios2/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-09 16:36:10 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-09 16:36:10 -0800
commitf4d68930a88219ffda60f137dcc858e4f5db6680 (patch)
tree024c8ae8d288a858b6b1c58ae8c1ef7dcfa481f8 /arch/nios2/kernel
parent3510ca19a82ba4c6a17af79c1f0448622a406efa (diff)
parentbb3fc5ddef93836a36a39308cf7eca82ef0a1c4c (diff)
Merge tag 'nios2-v4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2
Pull nios2 updates from Ley Foon Tan: - nios2: Remove unnecessary #ifdef guards - nios2: Switch to generic __xchg() - nios2: Fix unused variable warning * tag 'nios2-v4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2: nios2: Remove unnecessary #ifdef guards nios2: Switch to generic __xchg() nios2: Fix unused variable warning
Diffstat (limited to 'arch/nios2/kernel')
-rw-r--r--arch/nios2/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
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 */

Privacy Policy