aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorAlon Bar-Lev <alon.barlev@gmail.com>2007-02-12 03:54:06 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-12 12:48:37 -0500
commitcd81899a7d9e77ffd5280b10d0413fb241b18388 (patch)
treef9c07c100af964e5815e3934cbfa319624516b47 /arch/arm
parent3c253ca0f0930b767a5d6ac0c1b3c6f5619e28f9 (diff)
[PATCH] Dynamic kernel command-line: arm
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> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/kernel/setup.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index bbab134cd82d..ed522151878b 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -106,7 +106,7 @@ unsigned long phys_initrd_size __initdata = 0;
106static struct meminfo meminfo __initdata = { 0, }; 106static struct meminfo meminfo __initdata = { 0, };
107static const char *cpu_name; 107static const char *cpu_name;
108static const char *machine_name; 108static const char *machine_name;
109static char command_line[COMMAND_LINE_SIZE]; 109static char __initdata command_line[COMMAND_LINE_SIZE];
110 110
111static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE; 111static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
112static union { char c[4]; unsigned long l; } endian_test __initdata = { { 'l', '?', '?', 'b' } }; 112static union { char c[4]; unsigned long l; } endian_test __initdata = { { 'l', '?', '?', 'b' } };
@@ -803,8 +803,8 @@ void __init setup_arch(char **cmdline_p)
803 init_mm.end_data = (unsigned long) &_edata; 803 init_mm.end_data = (unsigned long) &_edata;
804 init_mm.brk = (unsigned long) &_end; 804 init_mm.brk = (unsigned long) &_end;
805 805
806 memcpy(saved_command_line, from, COMMAND_LINE_SIZE); 806 memcpy(boot_command_line, from, COMMAND_LINE_SIZE);
807 saved_command_line[COMMAND_LINE_SIZE-1] = '\0'; 807 boot_command_line[COMMAND_LINE_SIZE-1] = '\0';
808 parse_cmdline(cmdline_p, from); 808 parse_cmdline(cmdline_p, from);
809 paging_init(&meminfo, mdesc); 809 paging_init(&meminfo, mdesc);
810 request_standard_resources(&meminfo, mdesc); 810 request_standard_resources(&meminfo, mdesc);