summaryrefslogtreecommitdiffstats
path: root/arch/mips/au1000
diff options
context:
space:
mode:
authorPete Popov <ppopov@embeddedalley.com>2005-09-13 22:52:55 +0000
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 19:32:19 +0100
commit57e3e3b9187765f042c131db1a8b66bee67fc5fb (patch)
tree5b0d42e6e84fdd7b0f69e52c8b3ead2e03dbb2a9 /arch/mips/au1000
parent097975fc6651ee8f43ffc930ae0c4851ec979454 (diff)
downloadlinux-stable-57e3e3b9187765f042c131db1a8b66bee67fc5fb.tar.gz
linux-stable-57e3e3b9187765f042c131db1a8b66bee67fc5fb.tar.bz2
linux-stable-57e3e3b9187765f042c131db1a8b66bee67fc5fb.zip
When no yamon command line is passed to the kernel, preserve the default
compiled in command line. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/au1000')
-rw-r--r--arch/mips/au1000/common/prom.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/au1000/common/prom.c b/arch/mips/au1000/common/prom.c
index 22e5a85af4d5..9c171afd9a53 100644
--- a/arch/mips/au1000/common/prom.c
+++ b/arch/mips/au1000/common/prom.c
@@ -75,7 +75,8 @@ void prom_init_cmdline(void)
}
if (cp != &(arcs_cmdline[0])) /* get rid of trailing space */
--cp;
- *cp = '\0';
+ if (prom_argc > 1)
+ *cp = '\0';
}