diff options
author | Alon Bar-Lev <alon.barlev@gmail.com> | 2007-02-12 03:54:19 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 12:48:39 -0500 |
commit | 53c82622c2db808c015953336faecefc0ebf29bc (patch) | |
tree | c72ae95c58fe8e9012786ea8c97d05c618919534 /arch/sh/kernel/setup.c | |
parent | e06b1a3513bdd897e3c37c98ed7b16fa237dcb63 (diff) |
[PATCH] Dynamic kernel command-line: sh
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: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/sh/kernel/setup.c')
-rw-r--r-- | arch/sh/kernel/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 225f9ea5cdd7..d6b817aa568f 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c | |||
@@ -75,7 +75,7 @@ static struct sh_machine_vector* __init get_mv_byname(const char* name); | |||
75 | #define RAMDISK_PROMPT_FLAG 0x8000 | 75 | #define RAMDISK_PROMPT_FLAG 0x8000 |
76 | #define RAMDISK_LOAD_FLAG 0x4000 | 76 | #define RAMDISK_LOAD_FLAG 0x4000 |
77 | 77 | ||
78 | static char command_line[COMMAND_LINE_SIZE] = { 0, }; | 78 | static char __initdata command_line[COMMAND_LINE_SIZE] = { 0, }; |
79 | 79 | ||
80 | static struct resource code_resource = { .name = "Kernel code", }; | 80 | static struct resource code_resource = { .name = "Kernel code", }; |
81 | static struct resource data_resource = { .name = "Kernel data", }; | 81 | static struct resource data_resource = { .name = "Kernel data", }; |
@@ -90,8 +90,8 @@ static inline void parse_cmdline (char ** cmdline_p, char mv_name[MV_NAME_SIZE], | |||
90 | int len = 0; | 90 | int len = 0; |
91 | 91 | ||
92 | /* Save unparsed command line copy for /proc/cmdline */ | 92 | /* Save unparsed command line copy for /proc/cmdline */ |
93 | memcpy(saved_command_line, COMMAND_LINE, COMMAND_LINE_SIZE); | 93 | memcpy(boot_command_line, COMMAND_LINE, COMMAND_LINE_SIZE); |
94 | saved_command_line[COMMAND_LINE_SIZE-1] = '\0'; | 94 | boot_command_line[COMMAND_LINE_SIZE-1] = '\0'; |
95 | 95 | ||
96 | memory_start = (unsigned long)PAGE_OFFSET+__MEMORY_START; | 96 | memory_start = (unsigned long)PAGE_OFFSET+__MEMORY_START; |
97 | memory_end = memory_start + __MEMORY_SIZE; | 97 | memory_end = memory_start + __MEMORY_SIZE; |