aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 bbab134cd82..ed522151878 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);