---

yaml
---
r: 48023
b: refs/heads/master
c: d3e9cce
h: refs/heads/master
i:
  48021: 60893a3
  48019: 05809c0
  48015: b635c15
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: adf48856db47f4f0f661f2f4b7004890408135cf
+refs/heads/master: d3e9cceafd9c886561f602bcdcb03efd96e187ab

trunk/arch/xtensa/kernel/setup.c

@@ -78,7 +78,7 @@ extern unsigned long loops_per_jiffy;
 
 /* Command line specified as configuration option. */
 
-static char command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE];
 
 #ifdef CONFIG_CMDLINE_BOOL
 static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
@@ -253,8 +253,8 @@ void __init setup_arch(char **cmdline_p)
 	extern int mem_reserve(unsigned long, unsigned long, int);
 	extern void bootmem_init(void);
 
-	memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
-	saved_command_line[COMMAND_LINE_SIZE-1] = '\0';
+	memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
+	boot_command_line[COMMAND_LINE_SIZE-1] = '\0';
 	*cmdline_p = command_line;
 
 	/* Reserve some memory regions */