diff options
author | John Crispin <john@openwrt.org> | 2011-11-03 15:15:52 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2011-11-03 15:15:52 +0000 |
commit | ea36ad76bcf0043d137da37ea1aee7bded76f5a2 (patch) | |
tree | f75ee0417c813ac599e78048c15bdd5f4ffacb82 /target/linux/lantiq/patches-3.0/0002-MIPS-lantiq-fix-cmdline-parsing.patch | |
parent | d8722fac7046020715c41106df28371f3f521132 (diff) | |
download | upstream-ea36ad76bcf0043d137da37ea1aee7bded76f5a2.tar.gz upstream-ea36ad76bcf0043d137da37ea1aee7bded76f5a2.tar.bz2 upstream-ea36ad76bcf0043d137da37ea1aee7bded76f5a2.zip |
lantiq: bump to 3.1
SVN-Revision: 28721
Diffstat (limited to 'target/linux/lantiq/patches-3.0/0002-MIPS-lantiq-fix-cmdline-parsing.patch')
-rw-r--r-- | target/linux/lantiq/patches-3.0/0002-MIPS-lantiq-fix-cmdline-parsing.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/target/linux/lantiq/patches-3.0/0002-MIPS-lantiq-fix-cmdline-parsing.patch b/target/linux/lantiq/patches-3.0/0002-MIPS-lantiq-fix-cmdline-parsing.patch deleted file mode 100644 index 680a8dcd38..0000000000 --- a/target/linux/lantiq/patches-3.0/0002-MIPS-lantiq-fix-cmdline-parsing.patch +++ /dev/null @@ -1,37 +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(-) - -diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c -index 56ba007..5035c10 100644 ---- a/arch/mips/lantiq/prom.c -+++ b/arch/mips/lantiq/prom.c -@@ -45,10 +45,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.5.4 - |