mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* Re: [PATCH 10/26] Dynamic kernel command-line - ia64
       [not found] ` <200701230014.06793.alon.barlev@gmail.com>
@ 2007-01-27  8:24   ` Andrew Morton
  2007-01-27  8:34     ` Alon Bar-Lev
  0 siblings, 1 reply; 8+ messages in thread
From: Andrew Morton @ 2007-01-27  8:24 UTC (permalink / raw)
  To: Alon Bar-Lev; +Cc: linux-arch, linux-kernel, H. Peter Anvin, Bernhard Walle

On Tue, 23 Jan 2007 00:14:06 +0200
Alon Bar-Lev <alon.barlev@gmail.com> wrote:

> 
> 1. Rename saved_command_line into boot_command_line.
> 2. Set command_line as __initdata.
> 
> Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
> 
> ---
> 
> diff -urNp linux-2.6.20-rc4-mm1.org/arch/ia64/kernel/efi.c linux-2.6.20-rc4-mm1/arch/ia64/kernel/efi.c
> --- linux-2.6.20-rc4-mm1.org/arch/ia64/kernel/efi.c	2007-01-07 07:45:51.000000000 +0200
> +++ linux-2.6.20-rc4-mm1/arch/ia64/kernel/efi.c	2007-01-22 23:32:30.000000000 +0200
> @@ -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;
>  
>  chk_nointroute_opt(void)
>  {
>  	char *cp;
> -	extern char saved_command_line[];
> +	extern char __initdata boot_command_line[];

no no no no no no no.  Just because some whacked-out weenie went and put
extern declarations in .c files doesn't mean that we should copy them.

It doesn't even compile.

arch/ia64/kernel/efi.c: In function `efi_init':
arch/ia64/kernel/efi.c:416: error: section attribute cannot be specified for local variables

Please.  Go through the entire patchset, yank all those wrong private
declarations of boot_command_line[] and put a *single, kernel-wide*
declaration into a single, shared header file.

Thanks.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 10/26] Dynamic kernel command-line - ia64
  2007-01-27  8:24   ` [PATCH 10/26] Dynamic kernel command-line - ia64 Andrew Morton
@ 2007-01-27  8:34     ` Alon Bar-Lev
  2007-01-27  8:44       ` Andrew Morton
  0 siblings, 1 reply; 8+ messages in thread
From: Alon Bar-Lev @ 2007-01-27  8:34 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux-arch, linux-kernel, H. Peter Anvin, Bernhard Walle

On 1/27/07, Andrew Morton <akpm@osdl.org> wrote:
> no no no no no no no.  Just because some whacked-out weenie went and put
> extern declarations in .c files doesn't mean that we should copy them.
>
> It doesn't even compile.

Sorry... I don't have all environments.

> Please.  Go through the entire patchset, yank all those wrong private
> declarations of boot_command_line[] and put a *single, kernel-wide*
> declaration into a single, shared header file.

I thought of this, while I was making the patch, I could not understand why
the maintainer did not simply #include <linux/init.h>

I can add this to any module which declares this by-itself but because
I cannot test all arch, I am afraid it will cause more problems.

Preparing a patch... :)

Best Regards,
Alon Bar-Lev.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 10/26] Dynamic kernel command-line - ia64
  2007-01-27  8:34     ` Alon Bar-Lev
@ 2007-01-27  8:44       ` Andrew Morton
  2007-01-27 20:49         ` [PATCH] Dynamic kernel command-line - fixups Alon Bar-Lev
  0 siblings, 1 reply; 8+ messages in thread
From: Andrew Morton @ 2007-01-27  8:44 UTC (permalink / raw)
  To: Alon Bar-Lev; +Cc: linux-arch, linux-kernel, H. Peter Anvin, Bernhard Walle

On Sat, 27 Jan 2007 10:34:27 +0200
"Alon Bar-Lev" <alon.barlev@gmail.com> wrote:

> > Please.  Go through the entire patchset, yank all those wrong private
> > declarations of boot_command_line[] and put a *single, kernel-wide*
> > declaration into a single, shared header file.
> 
> I thought of this, while I was making the patch, I could not understand why
> the maintainer did not simply #include <linux/init.h>

"ooh, I'll get in trouble if I edit a non-arch file, and it's a hassle to
add another file to my changeset and I can't be assed testing other
architectures and nobody's looking so I'll just sneak it in there".

> I can add this to any module which declares this by-itself but because
> I cannot test all arch, I am afraid it will cause more problems.
> 
> Preparing a patch... :)

Against next -mm, please.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH] Dynamic kernel command-line - fixups
  2007-01-27  8:44       ` Andrew Morton
@ 2007-01-27 20:49         ` Alon Bar-Lev
  0 siblings, 0 replies; 8+ messages in thread
From: Alon Bar-Lev @ 2007-01-27 20:49 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux-kernel, Bernhard Walle, Jeff Dike


Remove in-source externs, linux/init.h is included in all cases.
This is a fixups for "Dynamic kernel command-line" patch.

It includes the ia64 fixup already added.
It also includes some uml __init fixups so that we can __initdata also its command_line.

[[[  I will resubmit it to next mm version as you requested,
I don't mean to bother you. if you find this simple
enough you have an option to include this. ]]]

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>

---

diff -urNp linux-2.6.20-rc4-mm1.dyn-cmdline/arch/ia64/kernel/efi.c linux-2.6.20-rc4-mm1.dyn-cmdline.fixups/arch/ia64/kernel/efi.c
--- linux-2.6.20-rc4-mm1.dyn-cmdline/arch/ia64/kernel/efi.c	2007-01-22 23:32:30.000000000 +0200
+++ linux-2.6.20-rc4-mm1.dyn-cmdline.fixups/arch/ia64/kernel/efi.c	2007-01-27 21:56:07.000000000 +0200
@@ -413,7 +413,6 @@ efi_init (void)
 	efi_char16_t *c16;
 	u64 efi_desc_size;
 	char *cp, vendor[100] = "unknown";
-	extern char __initdata boot_command_line[];
 	int i;
 
 	/* it's too early to be able to use the standard kernel command line support... */
diff -urNp linux-2.6.20-rc4-mm1.dyn-cmdline/arch/ia64/kernel/sal.c linux-2.6.20-rc4-mm1.dyn-cmdline.fixups/arch/ia64/kernel/sal.c
--- linux-2.6.20-rc4-mm1.dyn-cmdline/arch/ia64/kernel/sal.c	2007-01-22 23:32:30.000000000 +0200
+++ linux-2.6.20-rc4-mm1.dyn-cmdline.fixups/arch/ia64/kernel/sal.c	2007-01-27 21:57:07.000000000 +0200
@@ -194,7 +194,6 @@ static void __init
 chk_nointroute_opt(void)
 {
 	char *cp;
-	extern char __initdata boot_command_line[];
 
 	for (cp = boot_command_line; *cp; ) {
 		if (memcmp(cp, "nointroute", 10) == 0) {
diff -urNp linux-2.6.20-rc4-mm1.dyn-cmdline/arch/parisc/mm/init.c linux-2.6.20-rc4-mm1.dyn-cmdline.fixups/arch/parisc/mm/init.c
--- linux-2.6.20-rc4-mm1.dyn-cmdline/arch/parisc/mm/init.c	2007-01-22 23:32:30.000000000 +0200
+++ linux-2.6.20-rc4-mm1.dyn-cmdline.fixups/arch/parisc/mm/init.c	2007-01-27 22:06:51.000000000 +0200
@@ -77,7 +77,6 @@ static void __init mem_limit_func(void)
 {
 	char *cp, *end;
 	unsigned long limit;
-	extern char __initdata boot_command_line[];
 
 	/* We need this before __setup() functions are called */
 
diff -urNp linux-2.6.20-rc4-mm1.dyn-cmdline/arch/um/include/user_util.h linux-2.6.20-rc4-mm1.dyn-cmdline.fixups/arch/um/include/user_util.h
--- linux-2.6.20-rc4-mm1.dyn-cmdline/arch/um/include/user_util.h	2007-01-22 23:32:31.000000000 +0200
+++ linux-2.6.20-rc4-mm1.dyn-cmdline.fixups/arch/um/include/user_util.h	2007-01-27 21:57:41.000000000 +0200
@@ -38,8 +38,6 @@ extern unsigned long long highmem;
 
 extern char host_info[];
 
-extern char __initdata boot_command_line[];
-
 extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end;
 extern unsigned long _unprotected_end;
 extern unsigned long brk_start;
diff -urNp linux-2.6.20-rc4-mm1.dyn-cmdline/arch/um/kernel/um_arch.c linux-2.6.20-rc4-mm1.dyn-cmdline.fixups/arch/um/kernel/um_arch.c
--- linux-2.6.20-rc4-mm1.dyn-cmdline/arch/um/kernel/um_arch.c	2007-01-22 23:32:31.000000000 +0200
+++ linux-2.6.20-rc4-mm1.dyn-cmdline.fixups/arch/um/kernel/um_arch.c	2007-01-27 22:28:48.000000000 +0200
@@ -44,9 +44,9 @@
 #define DEFAULT_COMMAND_LINE "root=98:0"
 
 /* Changed in linux_main and setup_arch, which run before SMP is started */
-static char command_line[COMMAND_LINE_SIZE] = { 0 };
+static char __initdata command_line[COMMAND_LINE_SIZE] = { 0 };
 
-static void add_arg(char *arg)
+static void __init add_arg(char *arg)
 {
 	if (strlen(command_line) + strlen(arg) + 1 > COMMAND_LINE_SIZE) {
 		printf("add_arg: Too many command line arguments!\n");
@@ -331,7 +331,7 @@ EXPORT_SYMBOL(end_iomem);
 
 extern char __binary_start;
 
-int linux_main(int argc, char **argv)
+int __init linux_main(int argc, char **argv)
 {
 	unsigned long avail, diff;
 	unsigned long virtmem_size, max_physmem;
diff -urNp linux-2.6.20-rc4-mm1.dyn-cmdline/arch/x86_64/kernel/head64.c linux-2.6.20-rc4-mm1.dyn-cmdline.fixups/arch/x86_64/kernel/head64.c
--- linux-2.6.20-rc4-mm1.dyn-cmdline/arch/x86_64/kernel/head64.c	2007-01-22 23:32:31.000000000 +0200
+++ linux-2.6.20-rc4-mm1.dyn-cmdline.fixups/arch/x86_64/kernel/head64.c	2007-01-27 21:57:26.000000000 +0200
@@ -34,8 +34,6 @@ static void __init clear_bss(void)
 #define OLD_CL_BASE_ADDR        0x90000
 #define OLD_CL_OFFSET           0x90022
 
-extern char __initdata boot_command_line[];
-
 static void __init copy_bootdata(char *real_mode_data)
 {
 	int new_data;

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [patch 10/26] Dynamic kernel command-line - ia64
  2007-01-18 12:58 [patch 00/26] Dynamic kernel command-line Bernhard Walle
@ 2007-01-18 12:58 ` Bernhard Walle
  0 siblings, 0 replies; 8+ messages in thread
From: Bernhard Walle @ 2007-01-18 12:58 UTC (permalink / raw)
  To: linux-kernel; +Cc: Alon Bar-Lev

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


1. Rename saved_command_line into boot_command_line.
2. Set command_line as __initdata.

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>

---
 arch/ia64/kernel/efi.c   |    4 ++--
 arch/ia64/kernel/sal.c   |    4 ++--
 arch/ia64/kernel/setup.c |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

Index: linux-2.6.20-rc4-mm1/arch/ia64/kernel/efi.c
===================================================================
--- linux-2.6.20-rc4-mm1.orig/arch/ia64/kernel/efi.c
+++ linux-2.6.20-rc4-mm1/arch/ia64/kernel/efi.c
@@ -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) {
Index: linux-2.6.20-rc4-mm1/arch/ia64/kernel/sal.c
===================================================================
--- linux-2.6.20-rc4-mm1.orig/arch/ia64/kernel/sal.c
+++ linux-2.6.20-rc4-mm1/arch/ia64/kernel/sal.c
@@ -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");
Index: linux-2.6.20-rc4-mm1/arch/ia64/kernel/setup.c
===================================================================
--- linux-2.6.20-rc4-mm1.orig/arch/ia64/kernel/setup.c
+++ linux-2.6.20-rc4-mm1/arch/ia64/kernel/setup.c
@@ -463,7 +463,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();

-- 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 10/26] Dynamic kernel command-line - ia64
  2006-12-02 10:47 [PATCH 00/26] Dynamic kernel command-line Alon Bar-Lev
@ 2006-12-02 10:51 ` Alon Bar-Lev
  0 siblings, 0 replies; 8+ messages in thread
From: Alon Bar-Lev @ 2006-12-02 10:51 UTC (permalink / raw)
  To: linux-arch, linux-kernel


1. Rename saved_command_line into boot_command_line.
2. Set command_line as __initdata.

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>

---

diff -urNp linux-2.6.19.org/arch/ia64/kernel/efi.c linux-2.6.19/arch/ia64/kernel/efi.c
--- linux-2.6.19.org/arch/ia64/kernel/efi.c	2006-11-29 23:57:37.000000000 +0200
+++ linux-2.6.19/arch/ia64/kernel/efi.c	2006-12-02 11:31:32.000000000 +0200
@@ -412,11 +412,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.19.org/arch/ia64/kernel/sal.c linux-2.6.19/arch/ia64/kernel/sal.c
--- linux-2.6.19.org/arch/ia64/kernel/sal.c	2006-11-29 23:57:37.000000000 +0200
+++ linux-2.6.19/arch/ia64/kernel/sal.c	2006-12-02 11:31:32.000000000 +0200
@@ -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.19.org/arch/ia64/kernel/setup.c linux-2.6.19/arch/ia64/kernel/setup.c
--- linux-2.6.19.org/arch/ia64/kernel/setup.c	2006-11-29 23:57:37.000000000 +0200
+++ linux-2.6.19/arch/ia64/kernel/setup.c	2006-12-02 11:31:32.000000000 +0200
@@ -404,7 +404,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();

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 10/26] Dynamic kernel command-line - ia64
  2006-09-03 22:15 [PATCH 00/26] Dynamic kernel command-line - Resend please ignore last Alon Bar-Lev
@ 2006-09-03 22:19 ` Alon Bar-Lev
  0 siblings, 0 replies; 8+ messages in thread
From: Alon Bar-Lev @ 2006-09-03 22:19 UTC (permalink / raw)
  To: Andi Kleen
  Cc: Matt Domsch, Andrew Morton, linux-kernel, johninsd, davej, Riley,
	trini, davem, ecd, jj, anton, wli, lethal, rc, spyro, rth, avr32,
	hskinnemoen, starvik, ralf, matthew, grundler, geert, zippel,
	paulus, schwidefsky, heiko.carstens, uclinux-v850, chris


Rename saved_command_line into boot_command_line.

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 10/26] Dynamic kernel command-line - ia64
  2006-09-03 21:50 [PATCH 00/26] Dynamic kernel command-line Alon Bar-Lev
@ 2006-09-03 21:56 ` Alon Bar-Lev
  0 siblings, 0 replies; 8+ messages in thread
From: Alon Bar-Lev @ 2006-09-03 21:56 UTC (permalink / raw)
  To: Andi Kleen
  Cc: Matt Domsch, Andrew Morton, linux-kernel, johninsd, davej, Riley,
	trini, davem, ecd, jj, anton, wli, lethal, rc, spyro, rth, avr32,
	hskinnemoen, starvik, ralf, matthew, grundler, geert, zippel,
	paulus, schwidefsky, heiko.carstens, uclinux-v850, chris


Rename saved_command_line into boot_command_line.

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.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.028445

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2007-01-27 20:47 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <200701230010.34323.alon.barlev@gmail.com>
     [not found] ` <200701230014.06793.alon.barlev@gmail.com>
2007-01-27  8:24   ` [PATCH 10/26] Dynamic kernel command-line - ia64 Andrew Morton
2007-01-27  8:34     ` Alon Bar-Lev
2007-01-27  8:44       ` Andrew Morton
2007-01-27 20:49         ` [PATCH] Dynamic kernel command-line - fixups Alon Bar-Lev
2007-01-18 12:58 [patch 00/26] Dynamic kernel command-line Bernhard Walle
2007-01-18 12:58 ` [patch 10/26] Dynamic kernel command-line - ia64 Bernhard Walle
  -- strict thread matches above, loose matches on Subject: below --
2006-12-02 10:47 [PATCH 00/26] Dynamic kernel command-line Alon Bar-Lev
2006-12-02 10:51 ` [PATCH 10/26] Dynamic kernel command-line - ia64 Alon Bar-Lev
2006-09-03 22:15 [PATCH 00/26] Dynamic kernel command-line - Resend please ignore last Alon Bar-Lev
2006-09-03 22:19 ` [PATCH 10/26] Dynamic kernel command-line - ia64 Alon Bar-Lev
2006-09-03 21:50 [PATCH 00/26] Dynamic kernel command-line Alon Bar-Lev
2006-09-03 21:56 ` [PATCH 10/26] Dynamic kernel command-line - ia64 Alon Bar-Lev

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®