git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
txx9
/
generic
/
setup.c
diff --git
a/arch/mips/txx9/generic/setup.c
b/arch/mips/txx9/generic/setup.c
index d66802edebb2f7ea85d5004ac2791905a93ad57c..06e801c7e258d37f507fb70433cb9767ce2d8d88 100644
(file)
--- a/
arch/mips/txx9/generic/setup.c
+++ b/
arch/mips/txx9/generic/setup.c
@@
-160,7
+160,7
@@
static void __init prom_init_cmdline(void)
int argc;
int *argv32;
int i; /* Always ignore the "-c" at argv[0] */
int argc;
int *argv32;
int i; /* Always ignore the "-c" at argv[0] */
- static char builtin[C
L
_SIZE] __initdata;
+ static char builtin[C
OMMAND_LINE
_SIZE] __initdata;
if (fw_arg0 >= CKSEG0 || fw_arg1 < CKSEG0) {
/*
if (fw_arg0 >= CKSEG0 || fw_arg1 < CKSEG0) {
/*
@@
-315,7
+315,7
@@
static inline void txx9_cache_fixup(void)
static void __init preprocess_cmdline(void)
{
static void __init preprocess_cmdline(void)
{
- static char cmdline[C
L
_SIZE] __initdata;
+ static char cmdline[C
OMMAND_LINE
_SIZE] __initdata;
char *s;
strcpy(cmdline, arcs_cmdline);
char *s;
strcpy(cmdline, arcs_cmdline);