kernel: bump 4.14 to 4.14.120

[openwrt/openwrt.git] / target / linux / mvebu / patches-4.14 / 006-mvebu-Mangle-bootloader-s-kernel-arguments.patch

diff --git a/target/linux/mvebu/patches-4.14/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/mvebu/patches-4.14/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch
index c4ffd0efea986b3c42a0adae9006c00a9e109d7c..d15794f2e3e62e70e6416d04f1dc23764be60360 100644 (file)
--- a/target/linux/mvebu/patches-4.14/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch
+++ b/target/linux/mvebu/patches-4.14/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch
@@ -28,7 +28,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
 
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1938,6 +1938,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
+@@ -1939,6 +1939,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
          The command-line arguments provided by the boot loader will be
          appended to the the device tree bootargs property.
  
@@ -196,6 +196,6 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
 +      }
 +#endif
 +
+       /* parameters may set static keys */
+       jump_label_init();
        parse_early_param();
-       after_dashes = parse_args("Booting kernel",
-                                 static_command_line, __start___param,