1 files changed, 2 insertions, 4 deletions

diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c
index d7359ffbcbdd..09a769b69572 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;
@@ -285,7 +283,7 @@ void __init setup_arch(char **cmdline_p)
 {
         unsigned long max_low_pfn;
 
-        unflatten_device_tree();
+        unflatten_and_copy_device_tree();
 
         setup_cpuinfo();
 
@@ -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");
 }