diff options
author | John Crispin <blogic@openwrt.org> | 2011-11-03 15:15:52 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2011-11-03 15:15:52 +0000 |
commit | fc4b9802d7d9bd293e71057831d02fc0169fc9d3 (patch) | |
tree | b174b3a3d03c0c2b4a9b9c980efe38089069a2d4 /target/linux/lantiq/patches/0002-MIPS-lantiq-fix-cmdline-parsing.patch | |
parent | e4f42228c62c1ef8f075b6765f090af0983feb89 (diff) | |
download | upstream-fc4b9802d7d9bd293e71057831d02fc0169fc9d3.tar.gz upstream-fc4b9802d7d9bd293e71057831d02fc0169fc9d3.tar.bz2 upstream-fc4b9802d7d9bd293e71057831d02fc0169fc9d3.zip |
lantiq: bump to 3.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28721 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches/0002-MIPS-lantiq-fix-cmdline-parsing.patch')
-rw-r--r-- | target/linux/lantiq/patches/0002-MIPS-lantiq-fix-cmdline-parsing.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches/0002-MIPS-lantiq-fix-cmdline-parsing.patch b/target/linux/lantiq/patches/0002-MIPS-lantiq-fix-cmdline-parsing.patch new file mode 100644 index 0000000000..6966e1cbc0 --- /dev/null +++ b/target/linux/lantiq/patches/0002-MIPS-lantiq-fix-cmdline-parsing.patch @@ -0,0 +1,32 @@ +From b85d5204f2fe8c3b5e6172f7cc1741ad6e849334 Mon Sep 17 00:00:00 2001 +From: John Crispin <blogic@openwrt.org> +Date: Fri, 12 Aug 2011 16:27:38 +0200 +Subject: [PATCH 02/24] 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> +Cc: linux-mips@linux-mips.org +--- + arch/mips/lantiq/prom.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +--- a/arch/mips/lantiq/prom.c ++++ b/arch/mips/lantiq/prom.c +@@ -45,10 +45,12 @@ static void __init prom_init_cmdline(voi + 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)); + } |