git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
arch
/
xtensa
/
kernel
/
setup.c
diff --git
a/arch/xtensa/kernel/setup.c
b/arch/xtensa/kernel/setup.c
index
b6374c0
..
1ecf671
100644
(file)
--- a/
arch/xtensa/kernel/setup.c
+++ b/
arch/xtensa/kernel/setup.c
@@
-78,7
+78,7
@@
extern unsigned long loops_per_jiffy;
/* Command line specified as configuration option. */
/* 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;
#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);
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 */
*cmdline_p = command_line;
/* Reserve some memory regions */