From 2b6dbab8cfaab9fa4879c8d82defe47f630ee0ce Mon Sep 17 00:00:00 2001 From: Alon Bar-Lev Date: Mon, 12 Feb 2007 00:54:09 -0800 Subject: [PATCH] --- yaml --- r: 48003 b: refs/heads/master c: 87e1f9c6dcb4829fd8a68a3af87098cee8ef955b h: refs/heads/master i: 48001: fcd09a5f3b5935acc3de407430c45e22c6daa2d4 47999: 59ed087d625a9b6089fbc35f0417e07bcde241ba v: v3 --- [refs] | 2 +- trunk/arch/cris/kernel/setup.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a9530d8ae043..2e18c8fc3936 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf4352c0fc82e6dadfa7eea506c19dea0106baac +refs/heads/master: 87e1f9c6dcb4829fd8a68a3af87098cee8ef955b diff --git a/trunk/arch/cris/kernel/setup.c b/trunk/arch/cris/kernel/setup.c index ca8b45a0fe2e..65466c49d7a9 100644 --- a/trunk/arch/cris/kernel/setup.c +++ b/trunk/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();