summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@mips.com>2019-10-12 20:43:38 +0000
committerPaul Burton <paul.burton@mips.com>2019-10-12 13:44:24 -0700
commit9dd422f69777b928f8a12e5392d4aeeb00a55c2b (patch)
treee3cd933298f8329d9f3dd8e93aa206ba16c7253d /arch
parent972727766ee4d9e8b455c09e8dcb1e7dc14c4967 (diff)
downloadlinux-9dd422f69777b928f8a12e5392d4aeeb00a55c2b.tar.gz
linux-9dd422f69777b928f8a12e5392d4aeeb00a55c2b.tar.bz2
linux-9dd422f69777b928f8a12e5392d4aeeb00a55c2b.zip
MIPS: Make builtin_cmdline const & variable length
We have no need for the builtin_cmdline array to be fixed at the length of COMMAND_LINE_SIZE - we'll only copy out the string it contains up to its NULL terminator anyway, and cap the size at COMMAND_LINE_SIZE when copying into or concatenating with boot_command_line. The string value is also constant, so we can declare it as such to place it in the .init.rodata section. Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: linux-mips@vger.kernel.org
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 7ccc8a9e1bfe..2af05879772f 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -67,7 +67,7 @@ static char __initdata command_line[COMMAND_LINE_SIZE];
char __initdata arcs_cmdline[COMMAND_LINE_SIZE];
#ifdef CONFIG_CMDLINE_BOOL
-static char __initdata builtin_cmdline[COMMAND_LINE_SIZE] = CONFIG_CMDLINE;
+static const char builtin_cmdline[] __initconst = CONFIG_CMDLINE;
#else
static const char builtin_cmdline[] __initconst = "";
#endif