[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <200609040119.59772.alon.barlev@gmail.com>
Date: Mon, 4 Sep 2006 01:19:54 +0300
From: Alon Bar-Lev <alon.barlev@...il.com>
To: Andi Kleen <ak@...e.de>
Cc: Matt Domsch <Matt_Domsch@...l.com>, Andrew Morton <akpm@...l.org>,
linux-kernel@...r.kernel.org, johninsd@....rr.com,
davej@...emonkey.org.uk, Riley@...liams.name,
trini@...nel.crashing.org, davem@...emloft.net, ecd@...inaid.de,
jj@...site.ms.mff.cuni.cz, anton@...ba.org, wli@...omorphy.com,
lethal@...ux-sh.org, rc@....org.uk, spyro@....com, rth@...ddle.net,
avr32@...el.com, hskinnemoen@...el.com, starvik@...s.com,
ralf@...ux-mips.org, matthew@....cx, grundler@...isc-linux.org,
geert@...ux-m68k.org, zippel@...ux-m68k.org, paulus@...ba.org,
schwidefsky@...ibm.com, heiko.carstens@...ibm.com,
uclinux-v850@....nec.co.jp, chris@...kel.net
Subject: [PATCH 10/26] Dynamic kernel command-line - ia64
Rename saved_command_line into boot_command_line.
Signed-off-by: Alon Bar-Lev <alon.barlev@...il.com>
---
diff -urNp linux-2.6.18-rc5-mm1.org/arch/ia64/kernel/efi.c linux-2.6.18-rc5-mm1/arch/ia64/kernel/efi.c
--- linux-2.6.18-rc5-mm1.org/arch/ia64/kernel/efi.c 2006-09-03 18:56:48.000000000 +0300
+++ linux-2.6.18-rc5-mm1/arch/ia64/kernel/efi.c 2006-09-03 23:52:15.000000000 +0300
@@ -413,11 +413,11 @@ efi_init (void)
efi_char16_t *c16;
u64 efi_desc_size;
char *cp, vendor[100] = "unknown";
- extern char saved_command_line[];
+ extern char __initdata boot_command_line[];
int i;
/* it's too early to be able to use the standard kernel command line support... */
- for (cp = saved_command_line; *cp; ) {
+ for (cp = boot_command_line; *cp; ) {
if (memcmp(cp, "mem=", 4) == 0) {
mem_limit = memparse(cp + 4, &cp);
} else if (memcmp(cp, "max_addr=", 9) == 0) {
diff -urNp linux-2.6.18-rc5-mm1.org/arch/ia64/kernel/sal.c linux-2.6.18-rc5-mm1/arch/ia64/kernel/sal.c
--- linux-2.6.18-rc5-mm1.org/arch/ia64/kernel/sal.c 2006-09-03 18:55:08.000000000 +0300
+++ linux-2.6.18-rc5-mm1/arch/ia64/kernel/sal.c 2006-09-03 23:42:12.000000000 +0300
@@ -194,9 +194,9 @@ static void __init
chk_nointroute_opt(void)
{
char *cp;
- extern char saved_command_line[];
+ extern char __initdata boot_command_line[];
- for (cp = saved_command_line; *cp; ) {
+ for (cp = boot_command_line; *cp; ) {
if (memcmp(cp, "nointroute", 10) == 0) {
no_int_routing = 1;
printk ("no_int_routing on\n");
diff -urNp linux-2.6.18-rc5-mm1.org/arch/ia64/kernel/setup.c linux-2.6.18-rc5-mm1/arch/ia64/kernel/setup.c
--- linux-2.6.18-rc5-mm1.org/arch/ia64/kernel/setup.c 2006-09-03 18:56:48.000000000 +0300
+++ linux-2.6.18-rc5-mm1/arch/ia64/kernel/setup.c 2006-09-03 19:47:58.000000000 +0300
@@ -260,7 +260,7 @@ reserve_memory (void)
* after a kernel panic.
*/
{
- char *from = strstr(saved_command_line, "crashkernel=");
+ char *from = strstr(boot_command_line, "crashkernel=");
if (from) {
unsigned long size, base;
size = memparse(from + 12, &from);
@@ -433,7 +433,7 @@ setup_arch (char **cmdline_p)
ia64_patch_vtop((u64) __start___vtop_patchlist, (u64) __end___vtop_patchlist);
*cmdline_p = __va(ia64_boot_param->command_line);
- strlcpy(saved_command_line, *cmdline_p, COMMAND_LINE_SIZE);
+ strlcpy(boot_command_line, *cmdline_p, COMMAND_LINE_SIZE);
efi_init();
io_port_init();
@@ -514,7 +514,7 @@ setup_arch (char **cmdline_p)
#ifdef CONFIG_CRASH_DUMP
{
- char *from = strstr(saved_command_line, "elfcorehdr=");
+ char *from = strstr(boot_command_line, "elfcorehdr=");
if (from)
elfcorehdr_addr = memparse(from+11, &from);
--
VGER BF report: H 0
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists