From 95911557371ab54e0215d701b1052882aaa14012 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 18 May 2019 10:59:04 +0200 Subject: [PATCH] kernel: Fix arc kernel 4.14 build This fixes a patch for the ARC architecture. This was found by the build bot. Fixes: 810ee3b84a2b ("kernel: bump 4.14 to 4.14.104") Signed-off-by: Hauke Mehrtens --- .../332-arc-add-OWRTDTB-section.patch | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch b/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch index b2059b90ce..004bcfa729 100644 --- a/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch +++ b/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch @@ -38,7 +38,16 @@ Signed-off-by: Alexey Brodkin ;---------------------------------------------------------------- --- a/arch/arc/kernel/setup.c +++ b/arch/arc/kernel/setup.c -@@ -477,7 +477,7 @@ ignore_uboot_args: +@@ -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; +@@ -477,7 +479,7 @@ ignore_uboot_args: #endif if (use_embedded_dtb) { @@ -47,15 +56,6 @@ Signed-off-by: Alexey Brodkin if (!machine_desc) panic("Embedded DT invalid\n"); } -@@ -493,6 +493,8 @@ ignore_uboot_args: - } - } - -+extern struct boot_param_header __image_dtb; -+ - void __init setup_arch(char **cmdline_p) - { - handle_uboot_args(); --- a/arch/arc/kernel/vmlinux.lds.S +++ b/arch/arc/kernel/vmlinux.lds.S @@ -30,6 +30,19 @@ SECTIONS -- 2.25.1