[patch 06/26] Dynamic kernel command-line - cris

Bernhard Walle
2007-01-18T13:05:49Z

[-- Attachment #1: dynamic-kernel-command-line-cris.diff --]
[-- Type: text/plain, Size: 1241 bytes --]

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>

---
arch/cris/kernel/setup.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6.20-rc4-mm1/arch/cris/kernel/setup.c
===================================================================
--- linux-2.6.20-rc4-mm1.orig/arch/cris/kernel/setup.c
+++ linux-2.6.20-rc4-mm1/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();

--