diff options
author | Alon Bar-Lev <alon.barlev@gmail.com> | 2007-02-12 03:54:13 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 12:48:38 -0500 |
commit | 3561794d80843588ed8b47fffb20e2dcd9c40ff3 (patch) | |
tree | 4f4fdbea35c8d6f741e530251c81ebae77bf7c7b | |
parent | a8d91b8477aa433ee0131b031d782411976e1726 (diff) |
[PATCH] Dynamic kernel command-line: m32r
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: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/m32r/kernel/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c index 936205f7aba0..d64814385d70 100644 --- a/arch/m32r/kernel/setup.c +++ b/arch/m32r/kernel/setup.c | |||
@@ -64,7 +64,7 @@ struct screen_info screen_info = { | |||
64 | 64 | ||
65 | extern int root_mountflags; | 65 | extern int root_mountflags; |
66 | 66 | ||
67 | static char command_line[COMMAND_LINE_SIZE]; | 67 | static char __initdata command_line[COMMAND_LINE_SIZE]; |
68 | 68 | ||
69 | static struct resource data_resource = { | 69 | static struct resource data_resource = { |
70 | .name = "Kernel data", | 70 | .name = "Kernel data", |
@@ -95,8 +95,8 @@ static __inline__ void parse_mem_cmdline(char ** cmdline_p) | |||
95 | int usermem = 0; | 95 | int usermem = 0; |
96 | 96 | ||
97 | /* Save unparsed command line copy for /proc/cmdline */ | 97 | /* Save unparsed command line copy for /proc/cmdline */ |
98 | memcpy(saved_command_line, COMMAND_LINE, COMMAND_LINE_SIZE); | 98 | memcpy(boot_command_line, COMMAND_LINE, COMMAND_LINE_SIZE); |
99 | saved_command_line[COMMAND_LINE_SIZE-1] = '\0'; | 99 | boot_command_line[COMMAND_LINE_SIZE-1] = '\0'; |
100 | 100 | ||
101 | memory_start = (unsigned long)CONFIG_MEMORY_START+PAGE_OFFSET; | 101 | memory_start = (unsigned long)CONFIG_MEMORY_START+PAGE_OFFSET; |
102 | memory_end = memory_start+(unsigned long)CONFIG_MEMORY_SIZE; | 102 | memory_end = memory_start+(unsigned long)CONFIG_MEMORY_SIZE; |