kernel: bump 4.14 to 4.14.113
[openwrt/staging/chunkeey.git] / target / linux / generic / pending-4.14 / 332-arc-add-OWRTDTB-section.patch
index 6aa90c9..4c8d6e9 100644 (file)
@@ -42,16 +42,16 @@ Signed-off-by: Evgeniy Didin <Evgeniy.Didin@synopsys.com>
  ;----------------------------------------------------------------
 --- a/arch/arc/kernel/setup.c
 +++ b/arch/arc/kernel/setup.c
-@@ -434,6 +434,8 @@ static inline bool uboot_arg_invalid(uns
- #define UBOOT_TAG_CMDLINE     1
- #define UBOOT_TAG_DTB         2
+@@ -437,6 +437,8 @@ static inline bool uboot_arg_invalid(uns
+ /* We always pass 0 as magic from U-boot */
+ #define UBOOT_MAGIC_VALUE     0
  
 +extern struct boot_param_header __image_dtb;
 +
  void __init handle_uboot_args(void)
  {
        bool use_embedded_dtb = true;
-@@ -469,7 +471,7 @@ ignore_uboot_args:
+@@ -477,7 +479,7 @@ ignore_uboot_args:
  #endif
  
        if (use_embedded_dtb) {