Skip to contentSkip to conversation

Dynamic kernel command-line

PATCH In review Bernhard Walle 5 participants 51 messages Jan 18, 2007 – Jan 23, 2007

Subsystems (13)
Arm (32-bit) PowerPC MIPS s390 +9 more subsystems
lore
Share & tools
lore
#0 lore raw

cover Dynamic kernel command-line

This patch has already been posted by Alon Bar-Lev <[email protected]> in 2nd Dec 2006. He didn't get any response. Because I think that this patch would be really useful being able to increase the command line, I post this patch again to get some response.

This patches are against 2.6.20-rc4-mm1.

Current implementation stores a static command-line buffer allocated to COMMAND_LINE_SIZE size. Most architectures stores two copies of this buffer, one for future reference and one for parameter parsing.

Current kernel command-line size for most architecture is much too small for module parameters, video settings, initramfs parameters and much more. The problem is that setting COMMAND_LINE_SIZE to a grater value, allocates static buffers.

In order to allow a greater command-line size, these buffers should be dynamically allocated or marked as init disposable buffers, so unused memory can be released.

This patch renames the static saved_command_line variable into boot_command_line adding __initdata attribute, so that it can be disposed after initialization. This rename is required so applications that use saved_command_line will not be affected by this change.

It reintroduces saved_command_line as dynamically allocated buffer to match the data in boot_command_line.

It also mark secondary command-line buffer as __initdata, and copies it to dynamically allocated static_command_line buffer components may hold reference to it after initialization.

This patch is for linux-2.6.19 and is divided to target each architecture. I could not check this in any architecture so please forgive me if I got it wrong.

The per-architecture modification is very simple, use boot_command_line in place of saved_command_line. The common code is the change into dynamic command-line.

#1 lore raw

PATCH 1/26 Dynamic kernel command-line - common

1. Rename saved_command_line into boot_command_line, mark as init disposable.
2. Add dynamic allocated saved_command_line.
3. Add dynamic allocated static_command_line.
4. During startup copy:
boot_command_line into saved_command_line. arch command_line into static_command_line.
5. Parse static_command_line and not
arch command_line, so arch command_line may be freed.

---
 include/linux/init.h |    5 +++--
 init/main.c          |   29 ++++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 7 deletions(-)
include/linux/init.h +3 -2
Index: linux-2.6.20-rc4-mm1/include/linux/init.h
===================================================================
@@ -67,7 +67,8 @@ extern initcall_t __con_initcall_start[]
 extern initcall_t __security_initcall_start[], __security_initcall_end[];
 
 /* Defined in init/main.c */
-extern char saved_command_line[];
+extern char __initdata boot_command_line[];
+extern char *saved_command_line;
 extern unsigned int reset_devices;
 
 /* used by init/main.c */
@@ -164,7 +165,7 @@ struct obs_kernel_param {
 #define early_param(str, fn)					\
 	__setup_param(str, fn, fn, 1)
 
-/* Relies on saved_command_line being set */
+/* Relies on boot_command_line being set */
 void __init parse_early_param(void);
 #endif /* __ASSEMBLY__ */
 
init/main.c +24 -5
Index: linux-2.6.20-rc4-mm1/init/main.c
===================================================================
@@ -122,8 +122,12 @@ extern void time_init(void);
 void (*late_time_init)(void);
 extern void softirq_init(void);
 
-/* Untouched command line (eg. for /proc) saved by arch-specific code. */
-char saved_command_line[COMMAND_LINE_SIZE];
+/* Untouched command line saved by arch-specific code. */
+char __initdata boot_command_line[COMMAND_LINE_SIZE];
+/* Untouched saved command line (eg. for /proc) */
+char *saved_command_line;
+/* Command line for parameter parsing */
+static char *static_command_line;
 
 static char *execute_command;
 static char *ramdisk_execute_command;
@@ -406,6 +410,20 @@ static void __init smp_init(void)
 #endif
 
 /*
+ * We need to store the untouched command line for future reference.
+ * We also need to store the touched command line since the parameter
+ * parsing is performed in place, and we should allow a component to
+ * store reference of name/value for future reference.
+ */
+static void __init setup_command_line(char *command_line)
+{
+	saved_command_line = alloc_bootmem(strlen (boot_command_line)+1);
+	static_command_line = alloc_bootmem(strlen (command_line)+1);
+	strcpy (saved_command_line, boot_command_line);
+	strcpy (static_command_line, command_line);
+}
+
+/*
  * We need to finalize in a non-__init function or else race conditions
  * between the root thread and the init thread may cause start_kernel to
  * be reaped by free_initmem before the root thread has proceeded to
@@ -459,7 +477,7 @@ void __init parse_early_param(void)
 		return;
 
 	/* All fall through to do_early_param. */
-	strlcpy(tmp_cmdline, saved_command_line, COMMAND_LINE_SIZE);
+	strlcpy(tmp_cmdline, boot_command_line, COMMAND_LINE_SIZE);
 	parse_args("early options", tmp_cmdline, NULL, 0, do_early_param);
 	done = 1;
 }
@@ -509,6 +527,7 @@ asmlinkage void __init start_kernel(void
 	printk(KERN_NOTICE);
 	printk(linux_banner);
 	setup_arch(&command_line);
+	setup_command_line(command_line);
 	unwind_setup();
 	setup_per_cpu_areas();
 	smp_prepare_boot_cpu();	/* arch-specific boot-cpu hooks */
@@ -526,9 +545,9 @@ asmlinkage void __init start_kernel(void
 	preempt_disable();
 	build_all_zonelists();
 	page_alloc_init();
-	printk(KERN_NOTICE "Kernel command line: %s\n", saved_command_line);
+	printk(KERN_NOTICE "Kernel command line: %s\n", boot_command_line);
 	parse_early_param();
-	parse_args("Booting kernel", command_line, __start___param,
+	parse_args("Booting kernel", static_command_line, __start___param,
 		   __stop___param - __start___param,
 		   &unknown_bootoption);
 	if (!irqs_disabled()) {
#2 lore raw

PATCH 2/26 Dynamic kernel command-line - alpha

In reply to Bernhard Walle

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

---
 arch/alpha/kernel/setup.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/alpha/kernel/setup.c +3 -3
Index: linux-2.6.20-rc4-mm1/arch/alpha/kernel/setup.c
===================================================================
@@ -122,7 +122,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
@@ -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) {
#3 lore raw

PATCH 3/26 Dynamic kernel command-line - arm

In reply to Bernhard Walle

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

---
 arch/arm/kernel/setup.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/kernel/setup.c +3 -3
Index: linux-2.6.20-rc4-mm1/arch/arm/kernel/setup.c
===================================================================
@@ -106,7 +106,7 @@ unsigned long phys_initrd_size __initdat
 static struct meminfo meminfo __initdata = { 0, };
 static const char *cpu_name;
 static const char *machine_name;
-static char command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE];
 
 static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
 static union { char c[4]; unsigned long l; } endian_test __initdata = { { 'l', '?', '?', 'b' } };
@@ -803,8 +803,8 @@ void __init setup_arch(char **cmdline_p)
 	init_mm.end_data   = (unsigned long) &_edata;
 	init_mm.brk	   = (unsigned long) &_end;
 
-	memcpy(saved_command_line, from, COMMAND_LINE_SIZE);
-	saved_command_line[COMMAND_LINE_SIZE-1] = '\0';
+	memcpy(boot_command_line, from, COMMAND_LINE_SIZE);
+	boot_command_line[COMMAND_LINE_SIZE-1] = '\0';
 	parse_cmdline(cmdline_p, from);
 	paging_init(&meminfo, mdesc);
 	request_standard_resources(&meminfo, mdesc);
#4 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

Quoted 1 line · Bernhard Walle

2. Set command_line as __initdata.

You can't.

arch/arm/kernel/setup.c unsigned long phys_initrd_size __initdat · line 109

Quoted 2 lines
arch/arm/kernel/setup.c +1 -1
-static char command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE];

Uninitialised data is placed in the BSS. Adding __initdata to BSS data causes grief.

Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
#5 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

Quoted 10 lines · Russell King
Quoted 1 line · Bernhard Walle

2. Set command_line as __initdata.

You can't.

arch/arm/kernel/setup.c unsigned long phys_initrd_size __initdat · line 109

Quoted 2 lines
arch/arm/kernel/setup.c +1 -1
-static char command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE];

Uninitialised data is placed in the BSS. Adding __initdata to BSS data causes grief.

Thanks for the reply!

There are many places in kernel that uses __initdata for uninitialized variables.

For example:

./drivers/ide/ide.c:static int __initdata probe_ali14xx; ./drivers/ide/ide.c:static int __initdata probe_umc8672; ./drivers/ide/ide.c:static int __initdata probe_dtc2278; ./drivers/ide/ide.c:static int __initdata probe_ht6560b; ./drivers/ide/ide.c:static int __initdata probe_qd65xx; static int __initdata is_chipset_set[MAX_HWIFS];

So all these current places are wrong?
If I initialize the data will it be OK.

Best Regards,
Alon Bar-Lev.

#6 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

In reply to Russell King
Quoted 7 lines · Russell King

arch/arm/kernel/setup.c unsigned long phys_initrd_size __initdat · line 109

Quoted 2 lines · Bernhard Walle
arch/arm/kernel/setup.c +1 -1
-static char command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE];

Uninitialised data is placed in the BSS. Adding __initdata to BSS data causes grief.

Static variables are implicitly initialized to zero. Does that also count as initialization?

tom

#7 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

Quoted 11 lines · Tomas Carnecky
Quoted 7 lines · Russell King

arch/arm/kernel/setup.c unsigned long phys_initrd_size __initdat · line 109

Quoted 2 lines · Bernhard Walle
arch/arm/kernel/setup.c +1 -1
-static char command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE];

Uninitialised data is placed in the BSS. Adding __initdata to BSS data causes grief.

Static variables are implicitly initialized to zero. Does that also count as initialization?

No. As I say, they're placed in the BSS. The BSS is zeroed as part of the C runtime initialisation.

If you want to place a variable in a specific section, it must be explicitly initialised. Eg,

static char __initdata command_line[COMMAND_LINE_SIZE] = "";

However, there is a bigger question here: that is the tradeoff between making this variable part of the on-disk kernel image, but throw away the memory at runtime, or to leave it in the BSS where it will not be part of the on-disk kernel image, but will not be thrown away at runtime.

Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
#8 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

Quoted 10 lines · Russell King

If you want to place a variable in a specific section, it must be explicitly initialised. Eg,

static char __initdata command_line[COMMAND_LINE_SIZE] = "";

However, there is a bigger question here: that is the tradeoff between making this variable part of the on-disk kernel image, but throw away the memory at runtime, or to leave it in the BSS where it will not be part of the on-disk kernel image, but will not be thrown away at runtime.

This patch is a result of trying to extend the kernel command-line size on x86 to more than 256 bytes. People requested to not allocate a larger buffers for small systems.

I don't know who should decide the tradeoff...

So what you basically say is that many modules need to be fixed... ./arch/avr32/boards/atstk1000/setup.c ./arch/frv/kernel/setup.c ./arch/i386/kernel/acpi/boot.c ./arch/i386/kernel/mpparse.c
./arch/i386/kernel/setup.c
./arch/ia64/kernel/setup.c
<many more>

Best Regards,
Alon Bar-Lev.

#9 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

In reply to Russell King
Quoted 6 lines · Russell King

However, there is a bigger question here: that is the tradeoff between making this variable part of the on-disk kernel image, but throw away the memory at runtime, or to leave it in the BSS where it will not be part of the on-disk kernel image, but will not be thrown away at runtime.

Are 1024 bytes of a bigger kernel image really a problem? And even, normally kernel images are compressed, and compressing 1024 zeros can be compressed very well.

I think saving memory is more important than saving disk space. I know that most ARM device use flash disk, but also most ARM devices have limited RAM.

Regards,
Bernhard

#10 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

In reply to Russell King
Quoted 11 lines · On Thu, 18 Jan 2007 15:23:26 +0000 Russell King <[email protected]>…
Quoted 9 lines · Tomas Carnecky
Quoted 7 lines · Russell King

arch/arm/kernel/setup.c unsigned long phys_initrd_size __initdat · line 109

Quoted 2 lines · Bernhard Walle
arch/arm/kernel/setup.c +1 -1
-static char command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE];

Uninitialised data is placed in the BSS. Adding __initdata to BSS data causes grief.

Quoted 5 lines
Quoted 2 lines

Static variables are implicitly initialized to zero. Does that also count as initialization?

No. As I say, they're placed in the BSS. The BSS is zeroed as part of the C runtime initialisation.

I don't understand the objection. With the above change, command_line[] will end up consuming COMMAND_LINE_SIZE bytes of .data.init and will be reliably initialized to all-zeros by the compiler (won't it?)

Quoted 10 lines

If you want to place a variable in a specific section, it must be explicitly initialised. Eg,

static char __initdata command_line[COMMAND_LINE_SIZE] = "";

However, there is a bigger question here: that is the tradeoff between making this variable part of the on-disk kernel image, but throw away the memory at runtime, or to leave it in the BSS where it will not be part of the on-disk kernel image, but will not be thrown away at runtime.

Yes, it'll take some space in vmlinux. We could perhaps create a new __initbss to prevent that, I assume.

#11 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

Quoted 14 lines · Andrew Morton
Quoted 14 lines · On Thu, 18 Jan 2007 15:23:26 +0000 Russell King <[email protected]>…
Quoted 11 lines · Tomas Carnecky
Quoted 7 lines · Russell King

arch/arm/kernel/setup.c unsigned long phys_initrd_size __initdat · line 109

Quoted 2 lines · Bernhard Walle
arch/arm/kernel/setup.c +1 -1
-static char command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE];

Uninitialised data is placed in the BSS. Adding __initdata to BSS data causes grief.

Static variables are implicitly initialized to zero. Does that also count as initialization?

Quoted 6 lines
Quoted 2 lines

No. As I say, they're placed in the BSS. The BSS is zeroed as part of the C runtime initialisation.

I don't understand the objection. With the above change, command_line[] will end up consuming COMMAND_LINE_SIZE bytes of .data.init and will be reliably initialized to all-zeros by the compiler (won't it?)

You're reading into this something that was never there. The mail you are replying to is an explanatory one, not an objecting one.

My "objection" (if you want to call it that, it was more an observation) was that merely adding an __initdata to an uninitialised variable has in the past caused complaints from compilers about section mismatches and the like.

Maybe compilers are now smarter though.

Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
#12 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

In reply to Andrew Morton

Hello Andrew,

Can I do anything more in order to be closer to merge? Some general comments... or should I CC other people etc... I submitted this several times but got almost no architecture to ACK.

I just don't know how we can progress with this issue... All we wanted is to break the 256 limit in x86...

Best Regards,
Alon Bar-Lev.

Quoted 36 lines · Andrew Morton
Quoted 11 lines · On Thu, 18 Jan 2007 15:23:26 +0000 Russell King <[email protected]>…
Quoted 9 lines · Tomas Carnecky
Quoted 7 lines · Russell King

arch/arm/kernel/setup.c unsigned long phys_initrd_size __initdat · line 109

Quoted 2 lines · Bernhard Walle
arch/arm/kernel/setup.c +1 -1
-static char command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE];

Uninitialised data is placed in the BSS. Adding __initdata to BSS data causes grief.

Quoted 5 lines
Quoted 2 lines

Static variables are implicitly initialized to zero. Does that also count as initialization?

No. As I say, they're placed in the BSS. The BSS is zeroed as part of the C runtime initialisation.

I don't understand the objection. With the above change, command_line[] will end up consuming COMMAND_LINE_SIZE bytes of .data.init and will be reliably initialized to all-zeros by the compiler (won't it?)

Quoted 10 lines

If you want to place a variable in a specific section, it must be explicitly initialised. Eg,

static char __initdata command_line[COMMAND_LINE_SIZE] = "";

However, there is a bigger question here: that is the tradeoff between making this variable part of the on-disk kernel image, but throw away the memory at runtime, or to leave it in the BSS where it will not be part of the on-disk kernel image, but will not be thrown away at runtime.

Yes, it'll take some space in vmlinux. We could perhaps create a new __initbss to prevent that, I assume.

#13 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

Quoted 3 lines · On Mon, 22 Jan 2007 22:31:48 +0200 "Alon Bar-Lev" <[email protected]> wrote:

Hello Andrew,

Can I do anything more in order to be closer to merge?

Avoid top-posting? ;)

Quoted 5 lines

Some general comments... or should I CC other people etc... I submitted this several times but got almost no architecture to ACK.

I just don't know how we can progress with this issue... All we wanted is to break the 256 limit in x86...

yes, the patches looked reasonable-looking. But iirc they were against 2.6.19 which is prehistoric. Please redo and resend against a development kernel.

#14 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

Quoted 10 lines · Andrew Morton
Quoted 6 lines

Some general comments... or should I CC other people etc... I submitted this several times but got almost no architecture to ACK.

I just don't know how we can progress with this issue... All we wanted is to break the 256 limit in x86...

yes, the patches looked reasonable-looking. But iirc they were against 2.6.19 which is prehistoric. Please redo and resend against a development kernel.

I refreshed the patches from Alon against 2.6.20-rc4-mm1. Or was I totally wrong?

Regards,
Bernhard

Signature · 4 lines
SUSE LINUX Products GmbH                E-Mail:  [email protected]
Maxfeldstr. 5                           Phone:   +49 (911) 74053-0
90409 Nürnberg, Germany
OpenPGP DDAF6454: F61F 34CC 09CA FB82 C9F6  BA4B 8865 3696 DDAF 6454
#15 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

Quoted 2 lines · Bernhard Walle

I refreshed the patches from Alon against 2.6.20-rc4-mm1. Or was I totally wrong?

I don't know what is "Avoid top-posting? ;)" I hope it is a good thing... :) I will look at it again and submit it as requested.

Thank you,
Alon Bar-Lev.

#16 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

In reply to Russell King
Quoted 13 lines · Russell King
Quoted 11 lines · Tomas Carnecky
Quoted 7 lines · Russell King

arch/arm/kernel/setup.c unsigned long phys_initrd_size __initdat · line 109

Quoted 2 lines · Bernhard Walle
arch/arm/kernel/setup.c +1 -1
-static char command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE];

Uninitialised data is placed in the BSS. Adding __initdata to BSS data causes grief.

Static variables are implicitly initialized to zero. Does that also count as initialization?

Quoted 7 lines

No. As I say, they're placed in the BSS. The BSS is zeroed as part of the C runtime initialisation.

If you want to place a variable in a specific section, it must be explicitly initialised. Eg,

static char __initdata command_line[COMMAND_LINE_SIZE] = "";

Why? It must be initialised if you rely on a initialised value in the code. But I don't think that this in in case here. Can you tell me the code where you read from command_line before writing to it?

Thanks.

Regards,
Bernhard

#17 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

Quoted 17 lines · Bernhard Walle
Quoted 16 lines · Russell King
Quoted 11 lines · Tomas Carnecky
Quoted 7 lines · Russell King

arch/arm/kernel/setup.c unsigned long phys_initrd_size __initdat · line 109

Quoted 2 lines · Bernhard Walle
arch/arm/kernel/setup.c +1 -1
-static char command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE];

Uninitialised data is placed in the BSS. Adding __initdata to BSS data causes grief.

Static variables are implicitly initialized to zero. Does that also count as initialization?

No. As I say, they're placed in the BSS. The BSS is zeroed as part of the C runtime initialisation.

Quoted 7 lines
Quoted 4 lines

If you want to place a variable in a specific section, it must be explicitly initialised. Eg,

static char __initdata command_line[COMMAND_LINE_SIZE] = "";

Why? It must be initialised if you rely on a initialised value in the code.

That comment most certainly is 100% incorrect. The following:

static char foo[16];

has a well defined value when you read from it before writing to it. If you think otherwise, suggest you read any specification of the C language.

Quoted 2 lines

But I don't think that this in in case here. Can you tell me the code where you read from command_line before writing to it?

That wasn't my point.

Anyway, here's what the GCC manual has to say about use of __attribute__((section)) on variables:

`section ("SECTION-NAME")'
Use the section' attribute with an _initialized_ definition of a _global_ variable, as shown in the example. GCC issues a warning and otherwise ignores the section' attribute in uninitialized variable declarations.

You may only use the `section' attribute with a fully initialized global definition because of the way linkers work. The linker requires each object be defined once, with the exception that uninitialized variables tentatively go in the common' (or bss') section and can be multiply "defined". You can force a variable to be initialized with the -fno-common' flag or the nocommon' attribute.

which reflects precisely what I've been saying concerning the addition of __initdata.

Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
#18 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

Quoted 3 lines · Russell King

which reflects precisely what I've been saying concerning the addition of __initdata.

100 % correct, thanks.

Regards,
Bernhard

#19 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

In reply to Russell King
Quoted 2 lines · Russell King

which reflects precisely what I've been saying concerning the addition of __initdata.

Great!
So what do you thing we should do?

Modify this:
char __initdata boot_command_line[COMMAND_LINE_SIZE];

Into:
char __initdata boot_command_line[COMMAND_LINE_SIZE] = {0};

Or:
static char __initdata _boot_command_line[COMMAND_LINE_SIZE]; char __initdata *boot_command_line = _boot_command_line;

Or any other option... I will glad to receive any convention you see right.

Best Regards,
Alon Bar-Lev.

#20 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

Quoted 10 lines · Alon Bar-Lev
Quoted 2 lines · Russell King

which reflects precisely what I've been saying concerning the addition of __initdata.

Great!
So what do you thing we should do?

Modify this:
char __initdata boot_command_line[COMMAND_LINE_SIZE];

Quoted 8 lines

Into:
char __initdata boot_command_line[COMMAND_LINE_SIZE] = {0};

Or:
static char __initdata _boot_command_line[COMMAND_LINE_SIZE]; char __initdata *boot_command_line = _boot_command_line;

Or any other option... I will glad to receive any convention you see right.

See Message-ID: <[email protected]> sent on 18 January in this thread. Such strings might as well be initialised to an empty string.

Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
#21 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

Quoted 3 lines · Russell King

See Message-ID: <[email protected]> sent on 18 January in this thread. Such strings might as well be initialised to an empty string.

So it will be fine if I initialize it to "" and remove the static from the your example?
BTW: Is there a difference between "" and initialize it to {0}?

Thanks for you help!
Alon Bar-Lev.

#22 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

Quoted 7 lines · Alon Bar-Lev
Quoted 3 lines · Russell King

See Message-ID: <[email protected]> sent on 18 January in this thread. Such strings might as well be initialised to an empty string.

So it will be fine if I initialize it to "" and remove the static from the your example?

Why do you want to remove the static?

Quoted 1 line

BTW: Is there a difference between "" and initialize it to {0}?

Not in the end result. However, "" is a string but {0} is an array. So, "" helps to say to the reader "we're treating this as a string". Also, "" is quicker to type than {0}.

Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
#23 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

Quoted 1 line · Russell King

Why do you want to remove the static?

Since current design declare a buffer in main.c which is used by arch specific startup code, mainly setup.c.

Regards,
Alon Bar-Lev.

#24 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

In reply to Russell King
Quoted 4 lines · Russell King
Quoted 2 lines

So it will be fine if I initialize it to "" and remove the static from the your example?

Why do you want to remove the static?

Rossell, I am confused.
There are many places in kernel where there is static __initdata without initialization. Should all these be corrected too? Or your comment applies only to none static global data?

Best Regards,
Alon Bar-Lev.

#25 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

Quoted 4 lines · Alon Bar-Lev
Quoted 3 lines · Russell King
Quoted 2 lines

So it will be fine if I initialize it to "" and remove the static from the your example?

Quoted 8 lines
Quoted 1 line

Why do you want to remove the static?

Rossell, I am confused.
There are many places in kernel where there is static __initdata without initialization. Should all these be corrected too? Or your comment applies only to none static global data?

From what I remembered from previous mails on this list (which is what

caused me to pick up on this), and what I later quoted from the gcc manual, all those places (where something is marked __initdata but is not explicitly initialised) would appear to be incorrect.

So they should probably be fixed up.

Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
#26 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

Quoted 11 lines · Russell King
Quoted 4 lines

Rossell, I am confused.
There are many places in kernel where there is static __initdata without initialization. Should all these be corrected too? Or your comment applies only to none static global data?

From what I remembered from previous mails on this list (which is what caused me to pick up on this), and what I later quoted from the gcc manual, all those places (where something is marked __initdata but is not explicitly initialised) would appear to be incorrect.

So they should probably be fixed up.

Well... A lot of places in the kernel needs to be fixed, regardless this patch... I can probably creat a patch for this as well... But since I don't an expert in this one... We need to be sure this should be fixed.

Best Regards,
Alon Bar-Lev.

#27 lore raw

Re: [patch 03/26] Dynamic kernel command-line - arm

Quoted 11 lines · Alon Bar-Lev
Quoted 10 lines · Russell King
Quoted 4 lines

Rossell, I am confused.
There are many places in kernel where there is static __initdata without initialization. Should all these be corrected too? Or your comment applies only to none static global data?

From what I remembered from previous mails on this list (which is what caused me to pick up on this), and what I later quoted from the gcc manual, all those places (where something is marked __initdata but is not explicitly initialised) would appear to be incorrect.

Quoted 6 lines
Quoted 1 line

So they should probably be fixed up.

Well... A lot of places in the kernel needs to be fixed, regardless this patch... I can probably creat a patch for this as well... But since I don't an expert in this one... We need to be sure this should be fixed.

Don't particularly care; the amount of time spent discussing this issue is becoming rather rediculous, so I'd rather we reached some conclusion very soon; to this end this is going to be my last response on this subject.

I suggest that we leave what's already there, but any new instances we create are correct to the gcc manual.

Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
#28 lore raw

PATCH 4/26 Dynamic kernel command-line - arm26

In reply to Bernhard Walle

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

---
 arch/arm26/kernel/setup.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm26/kernel/setup.c +3 -3
Index: linux-2.6.20-rc4-mm1/arch/arm26/kernel/setup.c
===================================================================
@@ -80,7 +80,7 @@ unsigned long phys_initrd_size __initdat
 static struct meminfo meminfo __initdata = { 0, };
 static struct proc_info_item proc_info;
 static const char *machine_name;
-static char command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE];
 
 static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
 
@@ -492,8 +492,8 @@ void __init setup_arch(char **cmdline_p)
 	init_mm.end_data   = (unsigned long) &_edata;
 	init_mm.brk	   = (unsigned long) &_end;
 
-	memcpy(saved_command_line, from, COMMAND_LINE_SIZE);
-	saved_command_line[COMMAND_LINE_SIZE-1] = '\0';
+	memcpy(boot_command_line, from, COMMAND_LINE_SIZE);
+	boot_command_line[COMMAND_LINE_SIZE-1] = '\0';
 	parse_cmdline(&meminfo, cmdline_p, from);
 	bootmem_init(&meminfo);
 	paging_init(&meminfo);
#29 lore raw

PATCH 5/26 Dynamic kernel command-line - avr32

In reply to Bernhard Walle

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

---
 arch/avr32/kernel/setup.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/avr32/kernel/setup.c +3 -3
Index: linux-2.6.20-rc4-mm1/arch/avr32/kernel/setup.c
===================================================================
@@ -44,7 +44,7 @@ struct avr32_cpuinfo boot_cpu_data = {
 };
 EXPORT_SYMBOL(boot_cpu_data);
 
-static char command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE];
 
 /*
  * Should be more than enough, but if you have a _really_ complex
@@ -202,7 +202,7 @@ __tagtable(ATAG_MEM, parse_tag_mem);
 
 static int __init parse_tag_cmdline(struct tag *tag)
 {
-	strlcpy(saved_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);
+	strlcpy(boot_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);
 	return 0;
 }
 __tagtable(ATAG_CMDLINE, parse_tag_cmdline);
@@ -294,7 +294,7 @@ void __init setup_arch (char **cmdline_p
 	init_mm.end_data = (unsigned long) &_edata;
 	init_mm.brk = (unsigned long) &_end;
 
-	strlcpy(command_line, saved_command_line, COMMAND_LINE_SIZE);
+	strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
 	*cmdline_p = command_line;
 	parse_early_param();
 
#30 lore raw

PATCH 6/26 Dynamic kernel command-line - cris

In reply to Bernhard Walle

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

---
 arch/cris/kernel/setup.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/cris/kernel/setup.c +3 -3
Index: linux-2.6.20-rc4-mm1/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();
#31 lore raw

PATCH 7/26 Dynamic kernel command-line - frv

In reply to Bernhard Walle

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

---
 arch/frv/kernel/setup.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/frv/kernel/setup.c +3 -3
Index: linux-2.6.20-rc4-mm1/arch/frv/kernel/setup.c
===================================================================
@@ -110,7 +110,7 @@ unsigned long __initdata num_mappedpages
 
 struct cpuinfo_frv __nongprelbss boot_cpu_data;
 
-char command_line[COMMAND_LINE_SIZE];
+char __initdata command_line[COMMAND_LINE_SIZE];
 char __initdata redboot_command_line[COMMAND_LINE_SIZE];
 
 #ifdef CONFIG_PM
@@ -762,7 +762,7 @@ void __init setup_arch(char **cmdline_p)
 	printk("uClinux FR-V port done by Red Hat Inc <[email protected]>\n");
 #endif
 
-	memcpy(saved_command_line, redboot_command_line, COMMAND_LINE_SIZE);
+	memcpy(boot_command_line, redboot_command_line, COMMAND_LINE_SIZE);
 
 	determine_cpu();
 	determine_clocks(1);
@@ -803,7 +803,7 @@ void __init setup_arch(char **cmdline_p)
 #endif
 
 	/* deal with the command line - RedBoot may have passed one to the kernel */
-	memcpy(command_line, saved_command_line, sizeof(command_line));
+	memcpy(command_line, boot_command_line, sizeof(command_line));
 	*cmdline_p = &command_line[0];
 	parse_cmdline_early(command_line);
 
#32 lore raw

PATCH 8/26 Dynamic kernel command-line - h8300

In reply to Bernhard Walle

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

---
 arch/h8300/kernel/setup.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/h8300/kernel/setup.c +3 -3
Index: linux-2.6.20-rc4-mm1/arch/h8300/kernel/setup.c
===================================================================
@@ -54,7 +54,7 @@ unsigned long rom_length;
 unsigned long memory_start;
 unsigned long memory_end;
 
-char command_line[COMMAND_LINE_SIZE];
+char __initdata command_line[COMMAND_LINE_SIZE];
 
 extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end;
 extern int _ramstart, _ramend;
@@ -154,8 +154,8 @@ void __init setup_arch(char **cmdline_p)
 #endif
 	/* Keep a copy of command line */
 	*cmdline_p = &command_line[0];
-	memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
-	saved_command_line[COMMAND_LINE_SIZE-1] = 0;
+	memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
+	boot_command_line[COMMAND_LINE_SIZE-1] = 0;
 
 #ifdef DEBUG
 	if (strlen(*cmdline_p)) 
#33 lore raw

PATCH 9/26 Dynamic kernel command-line - i386

In reply to Bernhard Walle

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

---
 arch/i386/kernel/head.S  |    2 +-
 arch/i386/kernel/setup.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/i386/kernel/head.S +1 -1
Index: linux-2.6.20-rc4-mm1/arch/i386/kernel/head.S
===================================================================
@@ -104,7 +104,7 @@ ENTRY(startup_32)
 	movzwl OLD_CL_OFFSET,%esi
 	addl $(OLD_CL_BASE_ADDR),%esi
 2:
-	movl $(saved_command_line - __PAGE_OFFSET),%edi
+	movl $(boot_command_line - __PAGE_OFFSET),%edi
 	movl $(COMMAND_LINE_SIZE/4),%ecx
 	rep
 	movsl
arch/i386/kernel/setup.c +2 -2
Index: linux-2.6.20-rc4-mm1/arch/i386/kernel/setup.c
===================================================================
@@ -133,7 +133,7 @@ unsigned long saved_videomode;
 #define RAMDISK_PROMPT_FLAG		0x8000
 #define RAMDISK_LOAD_FLAG		0x4000	
 
-static char command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE];
 
 unsigned char __initdata boot_params[PARAM_SIZE];
 
@@ -577,7 +577,7 @@ void __init setup_arch(char **cmdline_p)
 		print_memory_map("user");
 	}
 
-	strlcpy(command_line, saved_command_line, COMMAND_LINE_SIZE);
+	strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
 	*cmdline_p = command_line;
 
 	max_low_pfn = setup_memory();
#34 lore raw

PATCH 10/26 Dynamic kernel command-line - ia64

In reply to Bernhard Walle

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

---
 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(-)
arch/ia64/kernel/efi.c +2 -2
Index: 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) {
arch/ia64/kernel/sal.c +2 -2
Index: 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");
arch/ia64/kernel/setup.c +1 -1
Index: 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();
#35 lore raw

PATCH 11/26 Dynamic kernel command-line - m32r

In reply to Bernhard Walle

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

---
 arch/m32r/kernel/setup.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/m32r/kernel/setup.c +3 -3
Index: linux-2.6.20-rc4-mm1/arch/m32r/kernel/setup.c
===================================================================
@@ -64,7 +64,7 @@ struct screen_info screen_info = {
 
 extern int root_mountflags;
 
-static char command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE];
 
 static struct resource data_resource = {
 	.name   = "Kernel data",
@@ -95,8 +95,8 @@ static __inline__ void parse_mem_cmdline
 	int usermem = 0;
 
 	/* Save unparsed command line copy for /proc/cmdline */
-	memcpy(saved_command_line, COMMAND_LINE, COMMAND_LINE_SIZE);
-	saved_command_line[COMMAND_LINE_SIZE-1] = '\0';
+	memcpy(boot_command_line, COMMAND_LINE, COMMAND_LINE_SIZE);
+	boot_command_line[COMMAND_LINE_SIZE-1] = '\0';
 
 	memory_start = (unsigned long)CONFIG_MEMORY_START+PAGE_OFFSET;
 	memory_end = memory_start+(unsigned long)CONFIG_MEMORY_SIZE;
#36 lore raw

PATCH 12/26 Dynamic kernel command-line - m68k

In reply to Bernhard Walle

Rename saved_command_line into boot_command_line.

---
 arch/m68k/kernel/setup.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/m68k/kernel/setup.c +1 -1
Index: linux-2.6.20-rc4-mm1/arch/m68k/kernel/setup.c
===================================================================
@@ -256,7 +256,7 @@ void __init setup_arch(char **cmdline_p)
 	init_mm.brk = (unsigned long) &_end;
 
 	*cmdline_p = m68k_command_line;
-	memcpy(saved_command_line, *cmdline_p, CL_SIZE);
+	memcpy(boot_command_line, *cmdline_p, CL_SIZE);
 
 	/* Parse the command line for arch-specific options.
 	 * For the m68k, this is currently only "debug=xxx" to enable printing
#37 lore raw

PATCH 13/26 Dynamic kernel command-line - m68knommu

In reply to Bernhard Walle

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

---
 arch/m68knommu/kernel/setup.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/m68knommu/kernel/setup.c +3 -3
Index: linux-2.6.20-rc4-mm1/arch/m68knommu/kernel/setup.c
===================================================================
@@ -44,7 +44,7 @@ unsigned long memory_end;
 EXPORT_SYMBOL(memory_start);
 EXPORT_SYMBOL(memory_end);
 
-char command_line[COMMAND_LINE_SIZE];
+char __initdata command_line[COMMAND_LINE_SIZE];
 
 /* setup some dummy routines */
 static void dummy_waitbut(void)
@@ -231,8 +231,8 @@ void setup_arch(char **cmdline_p)
 
 	/* Keep a copy of command line */
 	*cmdline_p = &command_line[0];
-	memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
-	saved_command_line[COMMAND_LINE_SIZE-1] = 0;
+	memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
+	boot_command_line[COMMAND_LINE_SIZE-1] = 0;
 
 #ifdef DEBUG
 	if (strlen(*cmdline_p))
#38 lore raw

PATCH 14/26 Dynamic kernel command-line - mips

In reply to Bernhard Walle

Rename saved_command_line into boot_command_line.

---
 arch/mips/kernel/setup.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/kernel/setup.c +1 -1
Index: linux-2.6.20-rc4-mm1/arch/mips/kernel/setup.c
===================================================================
@@ -452,7 +452,7 @@ static void __init arch_mem_init(char **
 	print_memory_map();
 
 	strlcpy(command_line, arcs_cmdline, sizeof(command_line));
-	strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
+	strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
 
 	*cmdline_p = command_line;
 
#39 lore raw

PATCH 15/26 Dynamic kernel command-line - parisc

In reply to Bernhard Walle

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

---
 arch/parisc/kernel/setup.c |    8 ++++----
 arch/parisc/mm/init.c      |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
arch/parisc/kernel/setup.c +4 -4
Index: linux-2.6.20-rc4-mm1/arch/parisc/kernel/setup.c
===================================================================
@@ -45,7 +45,7 @@
 #include <asm/io.h>
 #include <asm/setup.h>
 
-char	command_line[COMMAND_LINE_SIZE] __read_mostly;
+char	__initdata command_line[COMMAND_LINE_SIZE] __read_mostly;
 
 /* Intended for ccio/sba/cpu statistics under /proc/bus/{runway|gsc} */
 struct proc_dir_entry * proc_runway_root __read_mostly = NULL;
@@ -71,9 +71,9 @@ void __init setup_cmdline(char **cmdline
 	/* boot_args[0] is free-mem start, boot_args[1] is ptr to command line */
 	if (boot_args[0] < 64) {
 		/* called from hpux boot loader */
-		saved_command_line[0] = '\0';
+		boot_command_line[0] = '\0';
 	} else {
-		strcpy(saved_command_line, (char *)__va(boot_args[1]));
+		strcpy(boot_command_line, (char *)__va(boot_args[1]));
 
 #ifdef CONFIG_BLK_DEV_INITRD
 		if (boot_args[2] != 0) /* did palo pass us a ramdisk? */
@@ -84,7 +84,7 @@ void __init setup_cmdline(char **cmdline
 #endif
 	}
 
-	strcpy(command_line, saved_command_line);
+	strcpy(command_line, boot_command_line);
 	*cmdline_p = command_line;
 }
 
arch/parisc/mm/init.c +2 -2
Index: linux-2.6.20-rc4-mm1/arch/parisc/mm/init.c
===================================================================
@@ -77,12 +77,12 @@ static void __init mem_limit_func(void)
 {
 	char *cp, *end;
 	unsigned long limit;
-	extern char saved_command_line[];
+	extern char __initdata boot_command_line[];
 
 	/* We need this before __setup() functions are called */
 
 	limit = MAX_MEM;
-	for (cp = saved_command_line; *cp; ) {
+	for (cp = boot_command_line; *cp; ) {
 		if (memcmp(cp, "mem=", 4) == 0) {
 			cp += 4;
 			limit = memparse(cp, &end);
#40 lore raw

PATCH 16/26 Dynamic kernel command-line - powerpc

In reply to Bernhard Walle

Rename saved_command_line into boot_command_line.

---
 arch/powerpc/kernel/legacy_serial.c     |    2 +-
 arch/powerpc/kernel/prom.c              |    2 +-
 arch/powerpc/kernel/udbg.c              |    2 +-
 arch/powerpc/platforms/powermac/setup.c |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
arch/powerpc/kernel/legacy_serial.c +1 -1
Index: linux-2.6.20-rc4-mm1/arch/powerpc/kernel/legacy_serial.c
===================================================================
@@ -498,7 +498,7 @@ static int __init check_legacy_serial_co
 	DBG(" -> check_legacy_serial_console()\n");
 
 	/* The user has requested a console so this is already set up. */
-	if (strstr(saved_command_line, "console=")) {
+	if (strstr(boot_command_line, "console=")) {
 		DBG(" console was specified !\n");
 		return -EBUSY;
 	}
arch/powerpc/kernel/prom.c +1 -1
Index: linux-2.6.20-rc4-mm1/arch/powerpc/kernel/prom.c
===================================================================
@@ -991,7 +991,7 @@ void __init early_init_devtree(void *par
 	of_scan_flat_dt(early_init_dt_scan_memory, NULL);
 
 	/* Save command line for /proc/cmdline and then parse parameters */
-	strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);
+	strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);
 	parse_early_param();
 
 	/* Reserve LMB regions used by kernel, initrd, dt, etc... */
arch/powerpc/kernel/udbg.c +1 -1
Index: linux-2.6.20-rc4-mm1/arch/powerpc/kernel/udbg.c
===================================================================
@@ -146,7 +146,7 @@ void __init disable_early_printk(void)
 {
 	if (!early_console_initialized)
 		return;
-	if (strstr(saved_command_line, "udbg-immortal")) {
+	if (strstr(boot_command_line, "udbg-immortal")) {
 		printk(KERN_INFO "early console immortal !\n");
 		return;
 	}
arch/powerpc/platforms/powermac/setup.c +2 -2
Index: linux-2.6.20-rc4-mm1/arch/powerpc/platforms/powermac/setup.c
===================================================================
@@ -506,8 +506,8 @@ void note_bootable_part(dev_t dev, int p
 	if ((goodness <= current_root_goodness) &&
 	    ROOT_DEV != DEFAULT_ROOT_DEVICE)
 		return;
-	p = strstr(saved_command_line, "root=");
-	if (p != NULL && (p == saved_command_line || p[-1] == ' '))
+	p = strstr(boot_command_line, "root=");
+	if (p != NULL && (p == boot_command_line || p[-1] == ' '))
 		return;
 
 	if (!found_boot) {
#41 lore raw

PATCH 17/26 Dynamic kernel command-line - ppc

In reply to Bernhard Walle

Rename saved_command_line into boot_command_line.

---
 arch/ppc/kernel/setup.c         |    2 +-
 arch/ppc/platforms/lopec.c      |    2 +-
 arch/ppc/platforms/pplus.c      |    2 +-
 arch/ppc/platforms/prep_setup.c |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
arch/ppc/kernel/setup.c +1 -1
Index: linux-2.6.20-rc4-mm1/arch/ppc/kernel/setup.c
===================================================================
@@ -543,7 +543,7 @@ void __init setup_arch(char **cmdline_p)
 	init_mm.brk = (unsigned long) klimit;
 
 	/* Save unparsed command line copy for /proc/cmdline */
-	strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);
+	strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);
 	*cmdline_p = cmd_line;
 
 	parse_early_param();
arch/ppc/platforms/lopec.c +1 -1
Index: linux-2.6.20-rc4-mm1/arch/ppc/platforms/lopec.c
===================================================================
@@ -344,7 +344,7 @@ lopec_setup_arch(void)
 		 if (bootargs != NULL) {
 			 strcpy(cmd_line, bootargs);
 			 /* again.. */
-			 strcpy(saved_command_line, cmd_line);
+			 strcpy(boot_command_line, cmd_line);
 		}
 	}
 #endif
arch/ppc/platforms/pplus.c +1 -1
Index: linux-2.6.20-rc4-mm1/arch/ppc/platforms/pplus.c
===================================================================
@@ -592,7 +592,7 @@ static void __init pplus_setup_arch(void
 		if (bootargs != NULL) {
 			strcpy(cmd_line, bootargs);
 			/* again.. */
-			strcpy(saved_command_line, cmd_line);
+			strcpy(boot_command_line, cmd_line);
 		}
 	}
 #endif
arch/ppc/platforms/prep_setup.c +2 -2
Index: linux-2.6.20-rc4-mm1/arch/ppc/platforms/prep_setup.c
===================================================================
@@ -634,7 +634,7 @@ static void __init prep_init_sound(void)
 	/*
 	 * Find a way to push these informations to the cs4232 driver
 	 * Give it out with printk, when not in cmd_line?
-	 * Append it to  cmd_line and saved_command_line?
+	 * Append it to  cmd_line and boot_command_line?
 	 * Format is cs4232=io,irq,dma,dma2
 	 */
 }
@@ -897,7 +897,7 @@ prep_setup_arch(void)
 		 if (bootargs != NULL) {
 			 strcpy(cmd_line, bootargs);
 			 /* again.. */
-			 strcpy(saved_command_line, cmd_line);
+			 strcpy(boot_command_line, cmd_line);
 		}
 	}
 
#42 lore raw

PATCH 18/26 Dynamic kernel command-line - s390

In reply to Bernhard Walle

Rename saved_command_line into boot_command_line.

---
 arch/s390/kernel/setup.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/kernel/setup.c +1 -1
Index: linux-2.6.20-rc4-mm1/arch/s390/kernel/setup.c
===================================================================
@@ -625,7 +625,7 @@ setup_arch(char **cmdline_p)
 #endif /* CONFIG_64BIT */
 
 	/* Save unparsed command line copy for /proc/cmdline */
-	strlcpy(saved_command_line, COMMAND_LINE, COMMAND_LINE_SIZE);
+	strlcpy(boot_command_line, COMMAND_LINE, COMMAND_LINE_SIZE);
 
 	*cmdline_p = COMMAND_LINE;
 	*(*cmdline_p + COMMAND_LINE_SIZE - 1) = '\0';
#43 lore raw

PATCH 19/26 Dynamic kernel command-line - sh

In reply to Bernhard Walle

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

---
 arch/sh/kernel/setup.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/sh/kernel/setup.c +3 -3
Index: linux-2.6.20-rc4-mm1/arch/sh/kernel/setup.c
===================================================================
@@ -75,7 +75,7 @@ static struct sh_machine_vector* __init 
 #define RAMDISK_PROMPT_FLAG		0x8000
 #define RAMDISK_LOAD_FLAG		0x4000
 
-static char command_line[COMMAND_LINE_SIZE] = { 0, };
+static char __initdata command_line[COMMAND_LINE_SIZE] = { 0, };
 
 static struct resource code_resource = { .name = "Kernel code", };
 static struct resource data_resource = { .name = "Kernel data", };
@@ -90,8 +90,8 @@ static inline void parse_cmdline (char *
 	int len = 0;
 
 	/* Save unparsed command line copy for /proc/cmdline */
-	memcpy(saved_command_line, COMMAND_LINE, COMMAND_LINE_SIZE);
-	saved_command_line[COMMAND_LINE_SIZE-1] = '\0';
+	memcpy(boot_command_line, COMMAND_LINE, COMMAND_LINE_SIZE);
+	boot_command_line[COMMAND_LINE_SIZE-1] = '\0';
 
 	memory_start = (unsigned long)PAGE_OFFSET+__MEMORY_START;
 	memory_end = memory_start + __MEMORY_SIZE;
#44 lore raw

PATCH 20/26 Dynamic kernel command-line - sh64

In reply to Bernhard Walle

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

---
 arch/sh64/kernel/setup.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/sh64/kernel/setup.c +3 -3
Index: linux-2.6.20-rc4-mm1/arch/sh64/kernel/setup.c
===================================================================
@@ -83,7 +83,7 @@ extern int sh64_tlb_init(void);
 #define RAMDISK_PROMPT_FLAG		0x8000
 #define RAMDISK_LOAD_FLAG		0x4000
 
-static char command_line[COMMAND_LINE_SIZE] = { 0, };
+static char __initdata command_line[COMMAND_LINE_SIZE] = { 0, };
 unsigned long long memory_start = CONFIG_MEMORY_START;
 unsigned long long memory_end = CONFIG_MEMORY_START + (CONFIG_MEMORY_SIZE_IN_MB * 1024 * 1024);
 
@@ -95,8 +95,8 @@ static inline void parse_mem_cmdline (ch
 	int len = 0;
 
 	/* Save unparsed command line copy for /proc/cmdline */
-	memcpy(saved_command_line, COMMAND_LINE, COMMAND_LINE_SIZE);
-	saved_command_line[COMMAND_LINE_SIZE-1] = '\0';
+	memcpy(boot_command_line, COMMAND_LINE, COMMAND_LINE_SIZE);
+	boot_command_line[COMMAND_LINE_SIZE-1] = '\0';
 
 	for (;;) {
 	  /*
#45 lore raw

PATCH 21/26 Dynamic kernel command-line - sparc

In reply to Bernhard Walle

Rename saved_command_line into boot_command_line.

---
 arch/sparc/kernel/setup.c       |    2 +-
 arch/sparc/kernel/sparc_ksyms.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/sparc/kernel/setup.c +1 -1
Index: linux-2.6.20-rc4-mm1/arch/sparc/kernel/setup.c
===================================================================
@@ -246,7 +246,7 @@ void __init setup_arch(char **cmdline_p)
 
 	/* Initialize PROM console and command line. */
 	*cmdline_p = prom_getbootargs();
-	strcpy(saved_command_line, *cmdline_p);
+	strcpy(boot_command_line, *cmdline_p);
 
 	/* Set sparc_cpu_model */
 	sparc_cpu_model = sun_unknown;
arch/sparc/kernel/sparc_ksyms.c +1 -1
Index: linux-2.6.20-rc4-mm1/arch/sparc/kernel/sparc_ksyms.c
===================================================================
@@ -229,7 +229,7 @@ EXPORT_SYMBOL(prom_getproplen);
 EXPORT_SYMBOL(prom_getproperty);
 EXPORT_SYMBOL(prom_node_has_property);
 EXPORT_SYMBOL(prom_setprop);
-EXPORT_SYMBOL(saved_command_line);
+EXPORT_SYMBOL(boot_command_line);
 EXPORT_SYMBOL(prom_apply_obio_ranges);
 EXPORT_SYMBOL(prom_feval);
 EXPORT_SYMBOL(prom_getbool);
#46 lore raw

PATCH 22/26 Dynamic kernel command-line - sparc64

In reply to Bernhard Walle

Rename saved_command_line into boot_command_line.

---
 arch/sparc64/kernel/setup.c         |    2 +-
 arch/sparc64/kernel/sparc64_ksyms.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/sparc64/kernel/setup.c +1 -1
Index: linux-2.6.20-rc4-mm1/arch/sparc64/kernel/setup.c
===================================================================
@@ -315,7 +315,7 @@ void __init setup_arch(char **cmdline_p)
 {
 	/* Initialize PROM console and command line. */
 	*cmdline_p = prom_getbootargs();
-	strcpy(saved_command_line, *cmdline_p);
+	strcpy(boot_command_line, *cmdline_p);
 
 	if (tlb_type == hypervisor)
 		printk("ARCH: SUN4V\n");
arch/sparc64/kernel/sparc64_ksyms.c +1 -1
Index: linux-2.6.20-rc4-mm1/arch/sparc64/kernel/sparc64_ksyms.c
===================================================================
@@ -253,7 +253,7 @@ EXPORT_SYMBOL(prom_getproplen);
 EXPORT_SYMBOL(prom_getproperty);
 EXPORT_SYMBOL(prom_node_has_property);
 EXPORT_SYMBOL(prom_setprop);
-EXPORT_SYMBOL(saved_command_line);
+EXPORT_SYMBOL(boot_command_line);
 EXPORT_SYMBOL(prom_finddevice);
 EXPORT_SYMBOL(prom_feval);
 EXPORT_SYMBOL(prom_getbool);
#47 lore raw

PATCH 23/26 Dynamic kernel command-line - um

In reply to Bernhard Walle

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

---

---
 arch/um/include/user_util.h |    2 +-
 arch/um/kernel/um_arch.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/um/include/user_util.h +1 -1
Index: linux-2.6.20-rc4-mm1/arch/um/include/user_util.h
===================================================================
@@ -38,7 +38,7 @@ extern unsigned long long highmem;
 
 extern char host_info[];
 
-extern char saved_command_line[];
+extern char __initdata boot_command_line[];
 
 extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end;
 extern unsigned long _unprotected_end;
arch/um/kernel/um_arch.c +1 -1
Index: linux-2.6.20-rc4-mm1/arch/um/kernel/um_arch.c
===================================================================
@@ -482,7 +482,7 @@ void __init setup_arch(char **cmdline_p)
 	atomic_notifier_chain_register(&panic_notifier_list,
 			&panic_exit_notifier);
 	paging_init();
-        strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
+	strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
  	*cmdline_p = command_line;
 	setup_hostinfo();
 }
#48 lore raw

PATCH 24/26 Dynamic kernel command-line - v850

In reply to Bernhard Walle

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

---

---
 arch/v850/kernel/setup.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/v850/kernel/setup.c +3 -3
Index: linux-2.6.20-rc4-mm1/arch/v850/kernel/setup.c
===================================================================
@@ -42,7 +42,7 @@ extern char _root_fs_image_start __attri
 extern char _root_fs_image_end __attribute__ ((__weak__));
 
 
-char command_line[COMMAND_LINE_SIZE];
+char __initdata command_line[COMMAND_LINE_SIZE];
 
 /* Memory not used by the kernel.  */
 static unsigned long total_ram_pages;
@@ -64,8 +64,8 @@ void __init setup_arch (char **cmdline)
 {
 	/* Keep a copy of command line */
 	*cmdline = command_line;
-	memcpy (saved_command_line, command_line, COMMAND_LINE_SIZE);
-	saved_command_line[COMMAND_LINE_SIZE - 1] = '\0';
+	memcpy (boot_command_line, command_line, COMMAND_LINE_SIZE);
+	boot_command_line[COMMAND_LINE_SIZE - 1] = '\0';
 
 	console_verbose ();
 
#49 lore raw

PATCH 25/26 Dynamic kernel command-line - x86_64

In reply to Bernhard Walle

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

---

---
 arch/x86_64/kernel/head64.c    |    4 ++--
 arch/x86_64/kernel/setup.c     |    6 +++---
 include/asm-x86_64/bootsetup.h |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
include/asm-x86_64/bootsetup.h +1 -1
Index: linux-2.6.20-rc4-mm1/include/asm-x86_64/bootsetup.h
===================================================================
@@ -31,7 +31,7 @@ extern char x86_boot_params[BOOT_PARAM_S
 #define EDD_MBR_SIG_NR (*(unsigned char *) (PARAM+EDD_MBR_SIG_NR_BUF))
 #define EDD_MBR_SIGNATURE ((unsigned int *) (PARAM+EDD_MBR_SIG_BUF))
 #define EDD_BUF     ((struct edd_info *) (PARAM+EDDBUF))
-#define COMMAND_LINE saved_command_line
+#define COMMAND_LINE boot_command_line
 
 #define RAMDISK_IMAGE_START_MASK  	0x07FF
 #define RAMDISK_PROMPT_FLAG		0x8000
arch/x86_64/kernel/head64.c +2 -2
Index: linux-2.6.20-rc4-mm1/arch/x86_64/kernel/head64.c
===================================================================
@@ -34,7 +34,7 @@ static void __init clear_bss(void)
 #define OLD_CL_BASE_ADDR        0x90000
 #define OLD_CL_OFFSET           0x90022
 
-extern char saved_command_line[];
+extern char __initdata boot_command_line[];
 
 static void __init copy_bootdata(char *real_mode_data)
 {
@@ -50,7 +50,7 @@ static void __init copy_bootdata(char *r
 		new_data = OLD_CL_BASE_ADDR + * (u16 *) OLD_CL_OFFSET;
 	}
 	command_line = (char *) ((u64)(new_data));
-	memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
+	memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
 }
 
 void __init x86_64_start_kernel(char * real_mode_data)
arch/x86_64/kernel/setup.c +3 -3
Index: linux-2.6.20-rc4-mm1/arch/x86_64/kernel/setup.c
===================================================================
@@ -100,7 +100,7 @@ EXPORT_SYMBOL_GPL(edid_info);
 
 extern int root_mountflags;
 
-char command_line[COMMAND_LINE_SIZE];
+char __initdata command_line[COMMAND_LINE_SIZE];
 
 struct resource standard_io_resources[] = {
 	{ .name = "dma1", .start = 0x00, .end = 0x1f,
@@ -343,7 +343,7 @@ static void discover_ebda(void)
 
 void __init setup_arch(char **cmdline_p)
 {
-	printk(KERN_INFO "Command line: %s\n", saved_command_line);
+	printk(KERN_INFO "Command line: %s\n", boot_command_line);
 
  	ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
  	screen_info = SCREEN_INFO;
@@ -373,7 +373,7 @@ void __init setup_arch(char **cmdline_p)
 
 	early_identify_cpu(&boot_cpu_data);
 
-	strlcpy(command_line, saved_command_line, COMMAND_LINE_SIZE);
+	strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
 	*cmdline_p = command_line;
 
 	parse_early_param();
#50 lore raw

PATCH 26/26 Dynamic kernel command-line - xtensa

In reply to Bernhard Walle

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

---

---
 arch/xtensa/kernel/setup.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/xtensa/kernel/setup.c +3 -3
Index: linux-2.6.20-rc4-mm1/arch/xtensa/kernel/setup.c
===================================================================
@@ -78,7 +78,7 @@ extern unsigned long loops_per_jiffy;
 
 /* Command line specified as configuration option. */
 
-static char command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE];
 
 #ifdef CONFIG_CMDLINE_BOOL
 static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
@@ -253,8 +253,8 @@ void __init setup_arch(char **cmdline_p)
 	extern int mem_reserve(unsigned long, unsigned long, int);
 	extern void bootmem_init(void);
 
-	memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
-	saved_command_line[COMMAND_LINE_SIZE-1] = '\0';
+	memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
+	boot_command_line[COMMAND_LINE_SIZE-1] = '\0';
 	*cmdline_p = command_line;
 
 	/* Reserve some memory regions */