diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 00:57:21 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 00:57:21 -0500 |
| commit | 54c66f6d781e03dc0b23956234963c4911e6d1c0 (patch) | |
| tree | 40619a66ae6d8703a57bf681d087ffeabbffd346 /arch/h8300/kernel/setup.c | |
| parent | 8ce0a7df6e6117d8814e976d4b7ce6a6b2c9cf93 (diff) | |
| parent | 17e0e27020d028a790d97699aff85a43af5be472 (diff) | |
Merge branch 'master' into 85xx
Diffstat (limited to 'arch/h8300/kernel/setup.c')
| -rw-r--r-- | arch/h8300/kernel/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/h8300/kernel/setup.c b/arch/h8300/kernel/setup.c index 6adf8f41d2a1..313cd8081044 100644 --- a/arch/h8300/kernel/setup.c +++ b/arch/h8300/kernel/setup.c | |||
| @@ -54,7 +54,7 @@ unsigned long rom_length; | |||
| 54 | unsigned long memory_start; | 54 | unsigned long memory_start; |
| 55 | unsigned long memory_end; | 55 | unsigned long memory_end; |
| 56 | 56 | ||
| 57 | char command_line[COMMAND_LINE_SIZE]; | 57 | char __initdata command_line[COMMAND_LINE_SIZE]; |
| 58 | 58 | ||
| 59 | extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end; | 59 | extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end; |
| 60 | extern int _ramstart, _ramend; | 60 | extern int _ramstart, _ramend; |
| @@ -154,8 +154,8 @@ void __init setup_arch(char **cmdline_p) | |||
| 154 | #endif | 154 | #endif |
| 155 | /* Keep a copy of command line */ | 155 | /* Keep a copy of command line */ |
| 156 | *cmdline_p = &command_line[0]; | 156 | *cmdline_p = &command_line[0]; |
| 157 | memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE); | 157 | memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE); |
| 158 | saved_command_line[COMMAND_LINE_SIZE-1] = 0; | 158 | boot_command_line[COMMAND_LINE_SIZE-1] = 0; |
| 159 | 159 | ||
| 160 | #ifdef DEBUG | 160 | #ifdef DEBUG |
| 161 | if (strlen(*cmdline_p)) | 161 | if (strlen(*cmdline_p)) |