From 59ed087d625a9b6089fbc35f0417e07bcde241ba Mon Sep 17 00:00:00 2001 From: Alon Bar-Lev Date: Mon, 12 Feb 2007 00:54:05 -0800 Subject: [PATCH] --- yaml --- r: 47999 b: refs/heads/master c: 3c253ca0f0930b767a5d6ac0c1b3c6f5619e28f9 h: refs/heads/master i: 47997: bea304dc23e20dd15295e83edc28ba938f1b190d 47995: cb8ebfe1c4a99165b01ec5b6f5b0062f4fb1543a 47991: 6f6c2b96170b8b6d6afae02fd2adcacb4e5e0e10 47983: d441655c6956630b96f5bb3271de23f0345837f7 47967: b037f3ab5b0503aaa9cfbe441e9b0d5e5caea936 47935: 75366614b70bb13ad00931ab9c2b25284e62375b 47871: 2b28476ccc00a59a6f8dc671e9c0f845d0fe8c94 v: v3 --- [refs] | 2 +- trunk/arch/alpha/kernel/setup.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2faa75824266..3ad5b2c254f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30d7e0d466b3ac0b5ef77e4062bf9385f0d72270 +refs/heads/master: 3c253ca0f0930b767a5d6ac0c1b3c6f5619e28f9 diff --git a/trunk/arch/alpha/kernel/setup.c b/trunk/arch/alpha/kernel/setup.c index 1aea7c7c683c..d352c2b05f1a 100644 --- a/trunk/arch/alpha/kernel/setup.c +++ b/trunk/arch/alpha/kernel/setup.c @@ -122,7 +122,7 @@ static void get_sysnames(unsigned long, unsigned long, unsigned long, char **, char **); static void determine_cpu_caches (unsigned int); -static char command_line[COMMAND_LINE_SIZE]; +static char __initdata command_line[COMMAND_LINE_SIZE]; /* * The format of "screen_info" is strange, and due to early @@ -547,7 +547,7 @@ setup_arch(char **cmdline_p) } else { strlcpy(command_line, COMMAND_LINE, sizeof command_line); } - strcpy(saved_command_line, command_line); + strcpy(boot_command_line, command_line); *cmdline_p = command_line; /* @@ -589,7 +589,7 @@ setup_arch(char **cmdline_p) } /* Replace the command line, now that we've killed it with strsep. */ - strcpy(command_line, saved_command_line); + strcpy(command_line, boot_command_line); /* If we want SRM console printk echoing early, do it now. */ if (alpha_using_srm && srmcons_output) {