diff options
| author | Alon Bar-Lev <alon.barlev@gmail.com> | 2007-02-12 00:54:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 09:48:37 -0800 |
| commit | 87e1f9c6dcb4829fd8a68a3af87098cee8ef955b (patch) | |
| tree | 16b56b5ad920a07e1327eb7b5ab68b808f6c4fbd /arch/cris | |
| parent | bf4352c0fc82e6dadfa7eea506c19dea0106baac (diff) | |
| download | talos-obmc-linux-87e1f9c6dcb4829fd8a68a3af87098cee8ef955b.tar.gz talos-obmc-linux-87e1f9c6dcb4829fd8a68a3af87098cee8ef955b.zip | |
[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>
Diffstat (limited to 'arch/cris')
| -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; extern int root_mountflags; extern char _etext, _edata, _end; -char cris_command_line[COMMAND_LINE_SIZE] = { 0, }; +char __initdata cris_command_line[COMMAND_LINE_SIZE] = { 0, }; extern const unsigned long text_start, edata; /* set by the linker script */ extern unsigned long dram_start, dram_end; @@ -153,8 +153,8 @@ setup_arch(char **cmdline_p) #endif /* Save command line for future references. */ - memcpy(saved_command_line, cris_command_line, COMMAND_LINE_SIZE); - saved_command_line[COMMAND_LINE_SIZE - 1] = '\0'; + memcpy(boot_command_line, cris_command_line, COMMAND_LINE_SIZE); + boot_command_line[COMMAND_LINE_SIZE - 1] = '\0'; /* give credit for the CRIS port */ show_etrax_copyright(); |
