aboutsummaryrefslogtreecommitdiffstats
path: root/arch/openrisc/kernel/prom.c
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2013-08-26 12:28:50 -0400
committerRob Herring <rob.herring@calxeda.com>2013-10-09 12:38:02 -0400
commitbbf28b505ac2dd923b9051ca5031cf87bf7c40cc (patch)
tree93b7b0ee24f52f5ce3b8257cbd2f3ae92a54d965 /arch/openrisc/kernel/prom.c
parent312717f15ac7095c3ea98d487276781535ca7c0b (diff)
openrisc: use boot_command_line instead of private cmd_line
Save some pointless copying of the kernel command line and just use boot_command_line instead. The DT code already handles CONFIG_CMDLINE, so a separate copy is not needed. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Cc: Jonas Bonn <jonas@southpole.se> Cc: linux@lists.openrisc.net Reviewed-by: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'arch/openrisc/kernel/prom.c')
-rw-r--r--arch/openrisc/kernel/prom.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/openrisc/kernel/prom.c b/arch/openrisc/kernel/prom.c
index a63e76872f84..bf3fd05703c3 100644
--- a/arch/openrisc/kernel/prom.c
+++ b/arch/openrisc/kernel/prom.c
@@ -47,8 +47,6 @@
47#include <asm/sections.h> 47#include <asm/sections.h>
48#include <asm/setup.h> 48#include <asm/setup.h>
49 49
50extern char cmd_line[COMMAND_LINE_SIZE];
51
52void __init early_init_dt_add_memory_arch(u64 base, u64 size) 50void __init early_init_dt_add_memory_arch(u64 base, u64 size)
53{ 51{
54 size &= PAGE_MASK; 52 size &= PAGE_MASK;
@@ -67,15 +65,12 @@ void __init early_init_devtree(void *params)
67 * device-tree, including the platform type, initrd location and 65 * device-tree, including the platform type, initrd location and
68 * size, TCE reserve, and more ... 66 * size, TCE reserve, and more ...
69 */ 67 */
70 of_scan_flat_dt(early_init_dt_scan_chosen, cmd_line); 68 of_scan_flat_dt(early_init_dt_scan_chosen, boot_command_line);
71 69
72 /* Scan memory nodes and rebuild MEMBLOCKs */ 70 /* Scan memory nodes and rebuild MEMBLOCKs */
73 of_scan_flat_dt(early_init_dt_scan_root, NULL); 71 of_scan_flat_dt(early_init_dt_scan_root, NULL);
74 of_scan_flat_dt(early_init_dt_scan_memory, NULL); 72 of_scan_flat_dt(early_init_dt_scan_memory, NULL);
75 73
76 /* Save command line for /proc/cmdline and then parse parameters */
77 strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);
78
79 memblock_allow_resize(); 74 memblock_allow_resize();
80 75
81 /* We must copy the flattend device tree from init memory to regular 76 /* We must copy the flattend device tree from init memory to regular