kernel: bump 4.14 to 4.14.51

[openwrt/staging/blogic.git] / target / linux / ipq40xx / patches-4.14 / 997-device_tree_cmdline.patch

diff --git a/target/linux/ipq40xx/patches-4.14/997-device_tree_cmdline.patch b/target/linux/ipq40xx/patches-4.14/997-device_tree_cmdline.patch
index 51a35c17d98afcdfa8459b13a27f602679ee83ed..8b5e64a2d4aeb55cba34ed8620e55de20fe57eb2 100644 (file)
--- a/target/linux/ipq40xx/patches-4.14/997-device_tree_cmdline.patch
+++ b/target/linux/ipq40xx/patches-4.14/997-device_tree_cmdline.patch
@@ -1,12 +1,12 @@
 --- a/drivers/of/fdt.c
 +++ b/drivers/of/fdt.c
-@@ -1127,6 +1127,9 @@ int __init early_init_dt_scan_chosen(uns
+@@ -1130,6 +1130,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));
 +      p = of_get_flat_dt_prop(node, "bootargs-append", &l);
 +      if (p != NULL && l > 0)
 +              strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
-
+ 
        /*
         * CONFIG_CMDLINE is meant to be a default in case nothing else