diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 00:57:21 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 00:57:21 -0500 |
| commit | 54c66f6d781e03dc0b23956234963c4911e6d1c0 (patch) | |
| tree | 40619a66ae6d8703a57bf681d087ffeabbffd346 /arch/m32r/kernel/setup.c | |
| parent | 8ce0a7df6e6117d8814e976d4b7ce6a6b2c9cf93 (diff) | |
| parent | 17e0e27020d028a790d97699aff85a43af5be472 (diff) | |
Merge branch 'master' into 85xx
Diffstat (limited to 'arch/m32r/kernel/setup.c')
| -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; |