1. Rename saved_command_line into boot_command_line.
2. Set command_line as __initdata.
Signed-off-by: Alon Bar-Lev <[email protected]>
---
diff -urNp
linux-2.6.18-rc5-mm1.org/arch/alpha/kernel/setup.c
linux-2.6.18-rc5-mm1/arch/alpha/kernel/setup.c
--- linux-2.6.18-rc5-mm1.org/arch/alpha/kernel/setup.c
2006-09-03 18:56:47.000000000 +0300
+++ linux-2.6.18-rc5-mm1/arch/alpha/kernel/setup.c
2006-09-03 20:57:36.000000000 +0300
@@ -120,7 +120,7 @@ static void get_sysnames(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
@@ -541,7 +541,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;
/*
@@ -583,7 +583,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) {
--
VGER BF report: H 1.91147e-06
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]