diff options
author | Alon Bar-Lev <alon.barlev@gmail.com> | 2007-02-12 03:54:08 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 12:48:37 -0500 |
commit | bf4352c0fc82e6dadfa7eea506c19dea0106baac (patch) | |
tree | 5fbc450a5bff4830cd70120419934f9e662880a9 | |
parent | 64d5a70f956071f8434f403d44835a4895abb78e (diff) |
[PATCH] Dynamic kernel command-line: avr32
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>
Acked-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/avr32/kernel/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c index c6734aefb559..a1a7c3c3f522 100644 --- a/arch/avr32/kernel/setup.c +++ b/arch/avr32/kernel/setup.c | |||
@@ -45,7 +45,7 @@ struct avr32_cpuinfo boot_cpu_data = { | |||
45 | }; | 45 | }; |
46 | EXPORT_SYMBOL(boot_cpu_data); | 46 | EXPORT_SYMBOL(boot_cpu_data); |
47 | 47 | ||
48 | static char command_line[COMMAND_LINE_SIZE]; | 48 | static char __initdata command_line[COMMAND_LINE_SIZE]; |
49 | 49 | ||
50 | /* | 50 | /* |
51 | * Should be more than enough, but if you have a _really_ complex | 51 | * Should be more than enough, but if you have a _really_ complex |
@@ -202,7 +202,7 @@ __tagtable(ATAG_MEM, parse_tag_mem); | |||
202 | 202 | ||
203 | static int __init parse_tag_cmdline(struct tag *tag) | 203 | static int __init parse_tag_cmdline(struct tag *tag) |
204 | { | 204 | { |
205 | strlcpy(saved_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE); | 205 | strlcpy(boot_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE); |
206 | return 0; | 206 | return 0; |
207 | } | 207 | } |
208 | __tagtable(ATAG_CMDLINE, parse_tag_cmdline); | 208 | __tagtable(ATAG_CMDLINE, parse_tag_cmdline); |
@@ -294,7 +294,7 @@ void __init setup_arch (char **cmdline_p) | |||
294 | init_mm.end_data = (unsigned long) &_edata; | 294 | init_mm.end_data = (unsigned long) &_edata; |
295 | init_mm.brk = (unsigned long) &_end; | 295 | init_mm.brk = (unsigned long) &_end; |
296 | 296 | ||
297 | strlcpy(command_line, saved_command_line, COMMAND_LINE_SIZE); | 297 | strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); |
298 | *cmdline_p = command_line; | 298 | *cmdline_p = command_line; |
299 | parse_early_param(); | 299 | parse_early_param(); |
300 | 300 | ||