Commit cea63d80 authored by Anton Blanchard's avatar Anton Blanchard Committed by Linus Torvalds

[PATCH] ppc64: fix CONFIG_CMDLINE

When I cleaned up our cmdline parsing, I missed a RELOC of CONFIG_CMDLINE
itself.  Without it we copy something random into cmd_line, but only when
CONFIG_CMDLINE is enabled.
Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a46827ca
......@@ -1646,7 +1646,7 @@ prom_init(unsigned long r3, unsigned long r4, unsigned long pp,
RELOC(cmd_line[0]) = 0;
#ifdef CONFIG_CMDLINE
strlcpy(RELOC(cmd_line), CONFIG_CMDLINE, sizeof(cmd_line));
strlcpy(RELOC(cmd_line), RELOC(CONFIG_CMDLINE), sizeof(cmd_line));
#endif /* CONFIG_CMDLINE */
if ((long)_prom->chosen > 0) {
prom_getprop(_prom->chosen, "bootargs", p, sizeof(cmd_line));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment