You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
37 lines
1.1 KiB
37 lines
1.1 KiB
13 years ago
|
From 3ea88c1089b88b4860919a9cdea0cc5da4d09e2c Mon Sep 17 00:00:00 2001
|
||
|
|
From: John Crispin <blogic@openwrt.org>
|
||
|
|
Date: Fri, 12 Aug 2011 16:27:38 +0200
|
||
|
|
Subject: [PATCH 09/70] MIPS: lantiq: fix cmdline parsing
|
||
|
|
|
||
|
|
The code tested if the KSEG1 mapped address of argv was != 0. We need to use
|
||
|
|
CPHYSADDR instead to make the conditional actually work.
|
||
|
|
|
||
|
|
Signed-off-by: Thomas Langer <thomas.langer@lantiq.com>
|
||
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
||
|
|
---
|
||
|
|
arch/mips/lantiq/prom.c | 6 ++++--
|
||
|
|
1 files changed, 4 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c
|
||
|
|
index e3b1e25..acb8921 100644
|
||
|
|
--- a/arch/mips/lantiq/prom.c
|
||
|
|
+++ b/arch/mips/lantiq/prom.c
|
||
|
|
@@ -49,10 +49,12 @@ static void __init prom_init_cmdline(void)
|
||
|
|
char **argv = (char **) KSEG1ADDR(fw_arg1);
|
||
|
|
int i;
|
||
|
|
|
||
|
|
+ arcs_cmdline[0] = '\0';
|
||
|
|
+
|
||
|
|
for (i = 0; i < argc; i++) {
|
||
|
|
- char *p = (char *) KSEG1ADDR(argv[i]);
|
||
|
|
+ char *p = (char *) KSEG1ADDR(argv[i]);
|
||
|
|
|
||
|
|
- if (p && *p) {
|
||
|
|
+ if (CPHYSADDR(p) && *p) {
|
||
|
|
strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
|
||
|
|
strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.7.9.1
|
||
|
|
|