aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/prom_init.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-09-19 13:44:56 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-09-20 02:09:48 -0400
commit817c21ad9a1f00926f080265493923ada3458c63 (patch)
tree84733af08a403e6f1c1846a2e9a21cf49276660d /arch/powerpc/kernel/prom_init.c
parent27f4488872d9ef2a4b9aa2be58fb0789d6c0ba84 (diff)
powerpc/powernv: Get kernel command line accross OPAL takeover
We stash it in boot_command_line which isn't in BSS and so won't be overwritten. We then use that as a default cmd_line before we walk the device-tree. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/prom_init.c')
-rw-r--r--arch/powerpc/kernel/prom_init.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 9369287aa8c2..e3f390427216 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -1449,6 +1449,10 @@ static void prom_opal_takeover(void)
1449 opal_addr = top_addr; 1449 opal_addr = top_addr;
1450 args->hal_addr = opal_addr; 1450 args->hal_addr = opal_addr;
1451 1451
1452 /* Copy the command line to the kernel image */
1453 strlcpy(RELOC(boot_command_line), RELOC(prom_cmd_line),
1454 COMMAND_LINE_SIZE);
1455
1452 prom_debug(" k_image = 0x%lx\n", args->k_image); 1456 prom_debug(" k_image = 0x%lx\n", args->k_image);
1453 prom_debug(" k_size = 0x%lx\n", args->k_size); 1457 prom_debug(" k_size = 0x%lx\n", args->k_size);
1454 prom_debug(" k_entry = 0x%lx\n", args->k_entry); 1458 prom_debug(" k_entry = 0x%lx\n", args->k_entry);