generic/3.18: update to 3.18.3

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44121 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
kaloz 2015-01-25 11:39:30 +00:00
parent 8e5bc80fce
commit 0c28ecf9df
2 changed files with 8 additions and 12 deletions

View file

@ -1,8 +1,6 @@
Index: linux-3.18.2/drivers/of/fdt.c
===================================================================
--- linux-3.18.2.orig/drivers/of/fdt.c 2015-01-17 20:57:52.419074654 -0800
+++ linux-3.18.2/drivers/of/fdt.c 2015-01-17 20:57:52.367074398 -0800
@@ -903,6 +903,9 @@
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -903,6 +903,9 @@ int __init early_init_dt_scan_chosen(uns
p = of_get_flat_dt_prop(node, "bootargs", &l);
if (p != NULL && l > 0)
strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
@ -12,11 +10,9 @@ Index: linux-3.18.2/drivers/of/fdt.c
/*
* CONFIG_CMDLINE is meant to be a default in case nothing else
Index: linux-3.18.2/arch/mips/kernel/prom.c
===================================================================
--- linux-3.18.2.orig/arch/mips/kernel/prom.c 2015-01-17 20:57:52.419074654 -0800
+++ linux-3.18.2/arch/mips/kernel/prom.c 2015-01-17 20:57:52.415074633 -0800
@@ -49,6 +49,9 @@
--- a/arch/mips/kernel/prom.c
+++ b/arch/mips/kernel/prom.c
@@ -49,6 +49,9 @@ void * __init early_init_dt_alloc_memory
void __init __dt_setup_arch(void *bph)
{