diff options
author | Alon Bar-Lev <alon.barlev@gmail.com> | 2007-02-12 03:54:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 12:48:39 -0500 |
commit | d3e9cceafd9c886561f602bcdcb03efd96e187ab (patch) | |
tree | e1a128aa70283f047f1362b610f0ffb1adbb9bb7 | |
parent | adf48856db47f4f0f661f2f4b7004890408135cf (diff) |
[PATCH] Dynamic kernel command-line: xtensa
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: Chris Zankel <chris@zankel.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/xtensa/kernel/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index b6374c09de20..1ecf6716c327 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c | |||
@@ -78,7 +78,7 @@ extern unsigned long loops_per_jiffy; | |||
78 | 78 | ||
79 | /* Command line specified as configuration option. */ | 79 | /* Command line specified as configuration option. */ |
80 | 80 | ||
81 | static char command_line[COMMAND_LINE_SIZE]; | 81 | static char __initdata command_line[COMMAND_LINE_SIZE]; |
82 | 82 | ||
83 | #ifdef CONFIG_CMDLINE_BOOL | 83 | #ifdef CONFIG_CMDLINE_BOOL |
84 | static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE; | 84 | static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE; |
@@ -253,8 +253,8 @@ void __init setup_arch(char **cmdline_p) | |||
253 | extern int mem_reserve(unsigned long, unsigned long, int); | 253 | extern int mem_reserve(unsigned long, unsigned long, int); |
254 | extern void bootmem_init(void); | 254 | extern void bootmem_init(void); |
255 | 255 | ||
256 | memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE); | 256 | memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE); |
257 | saved_command_line[COMMAND_LINE_SIZE-1] = '\0'; | 257 | boot_command_line[COMMAND_LINE_SIZE-1] = '\0'; |
258 | *cmdline_p = command_line; | 258 | *cmdline_p = command_line; |
259 | 259 | ||
260 | /* Reserve some memory regions */ | 260 | /* Reserve some memory regions */ |