diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2013-08-26 11:28:50 -0500 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2013-10-09 11:38:02 -0500 |
| commit | bbf28b505ac2dd923b9051ca5031cf87bf7c40cc (patch) | |
| tree | 93b7b0ee24f52f5ce3b8257cbd2f3ae92a54d965 /arch/openrisc/kernel | |
| parent | 312717f15ac7095c3ea98d487276781535ca7c0b (diff) | |
| download | linux-stable-bbf28b505ac2dd923b9051ca5031cf87bf7c40cc.tar.gz linux-stable-bbf28b505ac2dd923b9051ca5031cf87bf7c40cc.tar.bz2 linux-stable-bbf28b505ac2dd923b9051ca5031cf87bf7c40cc.zip | |
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')
| -rw-r--r-- | arch/openrisc/kernel/prom.c | 7 | ||||
| -rw-r--r-- | arch/openrisc/kernel/setup.c | 4 |
2 files changed, 2 insertions, 9 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 @@ #include <asm/sections.h> #include <asm/setup.h> -extern char cmd_line[COMMAND_LINE_SIZE]; - void __init early_init_dt_add_memory_arch(u64 base, u64 size) { size &= PAGE_MASK; @@ -67,15 +65,12 @@ void __init early_init_devtree(void *params) * device-tree, including the platform type, initrd location and * size, TCE reserve, and more ... */ - of_scan_flat_dt(early_init_dt_scan_chosen, cmd_line); + of_scan_flat_dt(early_init_dt_scan_chosen, boot_command_line); /* Scan memory nodes and rebuild MEMBLOCKs */ of_scan_flat_dt(early_init_dt_scan_root, NULL); of_scan_flat_dt(early_init_dt_scan_memory, NULL); - /* Save command line for /proc/cmdline and then parse parameters */ - strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE); - memblock_allow_resize(); /* We must copy the flattend device tree from init memory to regular diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c index d7359ffbcbdd..719c5c8895c4 100644 --- a/arch/openrisc/kernel/setup.c +++ b/arch/openrisc/kernel/setup.c @@ -50,8 +50,6 @@ #include "vmlinux.h" -char __initdata cmd_line[COMMAND_LINE_SIZE] = CONFIG_CMDLINE; - static unsigned long __init setup_memory(void) { unsigned long bootmap_size; @@ -316,7 +314,7 @@ void __init setup_arch(char **cmdline_p) conswitchp = &dummy_con; #endif - *cmdline_p = cmd_line; + *cmdline_p = boot_command_line; printk(KERN_INFO "OpenRISC Linux -- http://openrisc.net\n"); } |