| To: | Ralf Baechle <ralf@linux-mips.org> |
|---|---|
| Subject: | [PATCH RESEND 08/17] MIPS: lantiq: fix cmdline parsing |
| From: | John Crispin <blogic@openwrt.org> |
| Date: | Wed, 11 Jan 2012 21:44:25 +0100 |
| Cc: | linux-mips@linux-mips.org, John Crispin <blogic@openwrt.org>, Thomas Langer <thomas.langer@lantiq.com> |
| In-reply-to: | <1326314674-9899-1-git-send-email-blogic@openwrt.org> |
| References: | <1326314674-9899-1-git-send-email-blogic@openwrt.org> |
| Sender: | linux-mips-bounce@linux-mips.org |
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 528e205..ee63a33 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.7.1
|
| Previous by Date: | [PATCH RESEND 07/17] MIPS: lantiq: fix early printk, John Crispin |
|---|---|
| Next by Date: | [PATCH RESEND 09/17] MIPS: lantiq: fix STP gpio groups, John Crispin |
| Previous by Thread: | Re: [PATCH RESEND 07/17] MIPS: lantiq: fix early printk, Ralf Baechle |
| Next by Thread: | Re: [PATCH RESEND 08/17] MIPS: lantiq: fix cmdline parsing, Ralf Baechle |
| Indexes: | [Date] [Thread] [Top] [All Lists] |