Merge branch 'h8300' into h8300_clk

[uclinux-h8/linux.git] / arch / h8300 / kernel / setup.c

diff --git a/arch/h8300/kernel/setup.c b/arch/h8300/kernel/setup.c
index 35164f0..979b207 100644 (file)
--- a/arch/h8300/kernel/setup.c
+++ b/arch/h8300/kernel/setup.c
@@ -46,7 +46,7 @@
 #include <asm/regs267x.h>
 #endif
 
-#define STUBSIZE 0xc000;
+#define STUBSIZE 0xc000
 
 unsigned long rom_length;
 unsigned long memory_start;
@@ -55,7 +55,7 @@ unsigned long memory_end;
 char __initdata command_line[COMMAND_LINE_SIZE];
 
 extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end;
-extern int _ramstart, _ramend;
+extern unsigned long _ramstart, _ramend;
 extern char _target_name[];
 void h8300_early_devices_register(void);
 
@@ -111,11 +111,12 @@ void __init setup_arch(char **cmdline_p)
 
 #ifdef CONFIG_DEFAULT_CMDLINE
        /* set from default command line */
-       if (*command_line == '\0')
-               strcpy(command_line,CONFIG_KERNEL_COMMAND);
+       if (*command_start == '\0')
+               memcpy(command_line, CONFIG_KERNEL_COMMAND, sizeof(command_line));
 #endif
-       /* Keep a copy of command line */
-       *cmdline_p = &command_line[0];
+       if (*command_line == '\0')
+               memcpy(command_line, command_start, sizeof(command_line));
+       *cmdline_p = command_line;
        memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
        boot_command_line[COMMAND_LINE_SIZE-1] = 0;