diff options
| author | Mike Frysinger <michael.frysinger@analog.com> | 2007-06-11 16:44:09 +0800 |
|---|---|---|
| committer | Bryan Wu <bryan.wu@analog.com> | 2007-06-11 16:44:09 +0800 |
| commit | 5e10b4a653b9c7942fd1044fe5b592d544736897 (patch) | |
| tree | 3fd71ab9fb2f4a92cc63c8545e11d63c8a20b147 /arch/blackfin | |
| parent | fd92348e520af92ddd48b8100cd0ccb16a055ed3 (diff) | |
| download | op-kernel-dev-5e10b4a653b9c7942fd1044fe5b592d544736897.zip op-kernel-dev-5e10b4a653b9c7942fd1044fe5b592d544736897.tar.gz | |
Blackfin arch: add support for Alon Bar-Lev's dynamic kernel command-line
Signed-off-by: Mike Frysinger <michael.frysinger@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/kernel/setup.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index 0ba5f4a..a24fa1a 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c @@ -61,7 +61,7 @@ EXPORT_SYMBOL(memory_mtd_start); EXPORT_SYMBOL(mtd_size); #endif -char command_line[COMMAND_LINE_SIZE]; +char __initdata command_line[COMMAND_LINE_SIZE]; #if defined(CONFIG_BLKFIN_DCACHE) || defined(CONFIG_BLKFIN_CACHE) static void generate_cpl_tables(void); @@ -205,7 +205,6 @@ void __init setup_arch(char **cmdline_p) #endif #if defined(CONFIG_CMDLINE_BOOL) - memset(command_line, 0, sizeof(command_line)); strncpy(&command_line[0], CONFIG_CMDLINE, sizeof(command_line)); command_line[sizeof(command_line) - 1] = 0; #endif @@ -213,7 +212,7 @@ void __init setup_arch(char **cmdline_p) /* Keep a copy of command line */ *cmdline_p = &command_line[0]; memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE); - boot_command_line[COMMAND_LINE_SIZE - 1] = 0; + boot_command_line[COMMAND_LINE_SIZE - 1] = '\0'; /* setup memory defaults from the user config */ physical_mem_end = 0; @@ -898,7 +897,7 @@ struct seq_operations cpuinfo_op = { .show = show_cpuinfo, }; -void __init cmdline_init(char *r0) +void __init cmdline_init(const char *r0) { if (r0) strncpy(command_line, r0, COMMAND_LINE_SIZE); |
