Merge tag 'for-3.13' of git://git.openrisc.net/~jonas/linux

[cascardo/linux.git] / arch / openrisc / kernel / setup.c

diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c
index 7d205be..4fc7ccc 100644 (file)
--- a/arch/openrisc/kernel/setup.c
+++ b/arch/openrisc/kernel/setup.c
@@ -51,8 +51,6 @@
 
 #include "vmlinux.h"
 
-char __initdata cmd_line[COMMAND_LINE_SIZE] = CONFIG_CMDLINE;
-
 static unsigned long __init setup_memory(void)
 {
        unsigned long bootmap_size;
@@ -286,7 +284,7 @@ void __init setup_arch(char **cmdline_p)
 {
        unsigned long max_low_pfn;
 
-       unflatten_device_tree();
+       unflatten_and_copy_device_tree();
 
        setup_cpuinfo();
 
@@ -317,7 +315,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");
 }