diff options
author | Alon Bar-Lev <alon.barlev@gmail.com> | 2007-02-12 03:54:07 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 12:48:37 -0500 |
commit | 64d5a70f956071f8434f403d44835a4895abb78e (patch) | |
tree | d409bafa2b5b576eaaa69ef74c2805ae5733b789 /arch | |
parent | cd81899a7d9e77ffd5280b10d0413fb241b18388 (diff) |
[PATCH] Dynamic kernel command-line: arm26
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: Ian Molton <spyro@f2s.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm26/kernel/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm26/kernel/setup.c b/arch/arm26/kernel/setup.c index 466ddb54b44f..0e006c6cd5a0 100644 --- a/arch/arm26/kernel/setup.c +++ b/arch/arm26/kernel/setup.c | |||
@@ -80,7 +80,7 @@ unsigned long phys_initrd_size __initdata = 0; | |||
80 | static struct meminfo meminfo __initdata = { 0, }; | 80 | static struct meminfo meminfo __initdata = { 0, }; |
81 | static struct proc_info_item proc_info; | 81 | static struct proc_info_item proc_info; |
82 | static const char *machine_name; | 82 | static const char *machine_name; |
83 | static char command_line[COMMAND_LINE_SIZE]; | 83 | static char __initdata command_line[COMMAND_LINE_SIZE]; |
84 | 84 | ||
85 | static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE; | 85 | static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE; |
86 | 86 | ||
@@ -492,8 +492,8 @@ void __init setup_arch(char **cmdline_p) | |||
492 | init_mm.end_data = (unsigned long) &_edata; | 492 | init_mm.end_data = (unsigned long) &_edata; |
493 | init_mm.brk = (unsigned long) &_end; | 493 | init_mm.brk = (unsigned long) &_end; |
494 | 494 | ||
495 | memcpy(saved_command_line, from, COMMAND_LINE_SIZE); | 495 | memcpy(boot_command_line, from, COMMAND_LINE_SIZE); |
496 | saved_command_line[COMMAND_LINE_SIZE-1] = '\0'; | 496 | boot_command_line[COMMAND_LINE_SIZE-1] = '\0'; |
497 | parse_cmdline(&meminfo, cmdline_p, from); | 497 | parse_cmdline(&meminfo, cmdline_p, from); |
498 | bootmem_init(&meminfo); | 498 | bootmem_init(&meminfo); |
499 | paging_init(&meminfo); | 499 | paging_init(&meminfo); |