From 83d9f072fe2b5215897f1655b53b1e76139bb9c4 Mon Sep 17 00:00:00 2001 From: Alon Bar-Lev Date: Mon, 12 Feb 2007 00:54:25 -0800 Subject: [PATCH] --- yaml --- r: 48023 b: refs/heads/master c: d3e9cceafd9c886561f602bcdcb03efd96e187ab h: refs/heads/master i: 48021: 60893a3b18c8dad3e54cbcc710a830ce363e80bc 48019: 05809c0803e71a5578d39d0d6820fc0013908264 48015: b635c155487df99d459a225760cf856ab0874195 v: v3 --- [refs] | 2 +- trunk/arch/xtensa/kernel/setup.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 47433b19182b..7e2dd694042a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: adf48856db47f4f0f661f2f4b7004890408135cf +refs/heads/master: d3e9cceafd9c886561f602bcdcb03efd96e187ab diff --git a/trunk/arch/xtensa/kernel/setup.c b/trunk/arch/xtensa/kernel/setup.c index b6374c09de20..1ecf6716c327 100644 --- a/trunk/arch/xtensa/kernel/setup.c +++ b/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 */