summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot/ps3.c
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2014-04-14 21:54:05 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-04-28 16:31:54 +1000
commita2dd5da77f2cc9fc9ff11ea6b699556254e94a6c (patch)
tree0304ad48129ca48360963cad6138d600deacbe8c /arch/powerpc/boot/ps3.c
parentbbad3e50e8ed2d48294c141e687d411430cacbcf (diff)
downloadop-kernel-dev-a2dd5da77f2cc9fc9ff11ea6b699556254e94a6c.zip
op-kernel-dev-a2dd5da77f2cc9fc9ff11ea6b699556254e94a6c.tar.gz
powerpc: Rename duplicate COMMAND_LINE_SIZE define
We have two definitions of COMMAND_LINE_SIZE, one for the kernel and one for the boot wrapper. I assume this is so the boot wrapper can be self sufficient and not rely on kernel headers. Having two defines with the same name is confusing, I just updated the wrong one when trying to bump it. Make the boot wrapper define unique by calling it BOOT_COMMAND_LINE_SIZE. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot/ps3.c')
-rw-r--r--arch/powerpc/boot/ps3.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/ps3.c b/arch/powerpc/boot/ps3.c
index 9954d98..4ec2d86 100644
--- a/arch/powerpc/boot/ps3.c
+++ b/arch/powerpc/boot/ps3.c
@@ -47,13 +47,13 @@ BSS_STACK(4096);
* The buffer is put in it's own section so that tools may locate it easier.
*/
-static char cmdline[COMMAND_LINE_SIZE]
+static char cmdline[BOOT_COMMAND_LINE_SIZE]
__attribute__((__section__("__builtin_cmdline")));
static void prep_cmdline(void *chosen)
{
if (cmdline[0] == '\0')
- getprop(chosen, "bootargs", cmdline, COMMAND_LINE_SIZE-1);
+ getprop(chosen, "bootargs", cmdline, BOOT_COMMAND_LINE_SIZE-1);
else
setprop_str(chosen, "bootargs", cmdline);
OpenPOWER on IntegriCloud