From 2fc3680dd066419576cb0129d0c1bd7618b90f1a Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Thu, 15 Sep 2016 15:27:45 +0200 Subject: kernel: update kernel 4.1 to version 4.1.34 Refresh patches for all targets supporting 4.1 and not marked broken. Compile-tested on all targets using 4.1 and not marked broken. Changes to generic/610-netfilter_match_bypass_default_checks.patch based on 84d489f64f3b382d5544e342f66d8806e94e85d3. Changes to generic/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch based on a90ee92337d60fd14b6431adcda9929b955f3408. Signed-off-by: Stijn Tintel --- target/linux/rb532/patches-4.1/001-cmdline_hack.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'target/linux/rb532/patches-4.1/001-cmdline_hack.patch') diff --git a/target/linux/rb532/patches-4.1/001-cmdline_hack.patch b/target/linux/rb532/patches-4.1/001-cmdline_hack.patch index 2429b1b..a39da9c 100644 --- a/target/linux/rb532/patches-4.1/001-cmdline_hack.patch +++ b/target/linux/rb532/patches-4.1/001-cmdline_hack.patch @@ -1,20 +1,20 @@ --- a/arch/mips/rb532/prom.c +++ b/arch/mips/rb532/prom.c @@ -67,6 +67,7 @@ static inline unsigned long tag2ul(char - return simple_strtoul(num, 0, 10); + return simple_strtoul(num, 0, 10); } - + +extern char __image_cmdline[]; void __init prom_setup_cmdline(void) { - static char cmd_line[COMMAND_LINE_SIZE] __initdata; + static char cmd_line[COMMAND_LINE_SIZE] __initdata; @@ -108,6 +109,9 @@ void __init prom_setup_cmdline(void) - } - *(cp++) = ' '; - + } + *(cp++) = ' '; + + strcpy(cp,(__image_cmdline)); + cp += strlen(__image_cmdline); + - i = strlen(arcs_cmdline); - if (i > 0) { - *(cp++) = ' '; + i = strlen(arcs_cmdline); + if (i > 0) { + *(cp++) = ' '; -- cgit v1.1