---

yaml --- r: 57808 b: refs/heads/master c: 5e10b4a h: refs/heads/master v: v3
git-mirror · Jun 11, 2007 · 4913405 · 4913405
1 parent d2f5ad4
commit 4913405
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd92348e520af92ddd48b8100cd0ccb16a055ed3
+refs/heads/master: 5e10b4a653b9c7942fd1044fe5b592d544736897
diff --git a/trunk/arch/blackfin/kernel/setup.c b/trunk/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,15 +205,14 @@ 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
 
 	/* 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);