diff options
author | John Crispin <blogic@openwrt.org> | 2012-03-25 08:50:09 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2012-03-25 08:50:09 +0000 |
commit | 62692a5350408bf5820e43b4d68150bf8ecac2d2 (patch) | |
tree | fcbc09d1188b157091e186d10871e28abf340864 /target/linux/lantiq/patches/0002-MIPS-lantiq-fix-cmdline-parsing.patch | |
parent | 617f57c20a853957f6aa15611fff52ef410fc055 (diff) | |
download | master-187ad058-62692a5350408bf5820e43b4d68150bf8ecac2d2.tar.gz master-187ad058-62692a5350408bf5820e43b4d68150bf8ecac2d2.tar.bz2 master-187ad058-62692a5350408bf5820e43b4d68150bf8ecac2d2.zip |
[lantiq] bump kernel to 3.2.12
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31060 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, 0 insertions, 32 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 deleted file mode 100644 index 6966e1cbc0..0000000000 --- a/target/linux/lantiq/patches/0002-MIPS-lantiq-fix-cmdline-parsing.patch +++ /dev/null @@ -1,32 +0,0 @@ -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)); - } |