diff options
author | Alon Bar-Lev <alon.barlev@gmail.com> | 2007-02-12 03:54:09 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 12:48:37 -0500 |
commit | 87e1f9c6dcb4829fd8a68a3af87098cee8ef955b (patch) | |
tree | 16b56b5ad920a07e1327eb7b5ab68b808f6c4fbd | |
parent | bf4352c0fc82e6dadfa7eea506c19dea0106baac (diff) |
[PATCH] Dynamic kernel command-line: cris
1. Rename saved_command_line into boot_command_line.
2. Set cris_command_line as __initdata.
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/cris/kernel/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c index ca8b45a0fe2e..65466c49d7a9 100644 --- a/arch/cris/kernel/setup.c +++ b/arch/cris/kernel/setup.c | |||
@@ -29,7 +29,7 @@ struct screen_info screen_info; | |||
29 | extern int root_mountflags; | 29 | extern int root_mountflags; |
30 | extern char _etext, _edata, _end; | 30 | extern char _etext, _edata, _end; |
31 | 31 | ||
32 | char cris_command_line[COMMAND_LINE_SIZE] = { 0, }; | 32 | char __initdata cris_command_line[COMMAND_LINE_SIZE] = { 0, }; |
33 | 33 | ||
34 | extern const unsigned long text_start, edata; /* set by the linker script */ | 34 | extern const unsigned long text_start, edata; /* set by the linker script */ |
35 | extern unsigned long dram_start, dram_end; | 35 | extern unsigned long dram_start, dram_end; |
@@ -153,8 +153,8 @@ setup_arch(char **cmdline_p) | |||
153 | #endif | 153 | #endif |
154 | 154 | ||
155 | /* Save command line for future references. */ | 155 | /* Save command line for future references. */ |
156 | memcpy(saved_command_line, cris_command_line, COMMAND_LINE_SIZE); | 156 | memcpy(boot_command_line, cris_command_line, COMMAND_LINE_SIZE); |
157 | saved_command_line[COMMAND_LINE_SIZE - 1] = '\0'; | 157 | boot_command_line[COMMAND_LINE_SIZE - 1] = '\0'; |
158 | 158 | ||
159 | /* give credit for the CRIS port */ | 159 | /* give credit for the CRIS port */ |
160 | show_etrax_copyright(); | 160 | show_etrax_copyright(); |