diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-05-18 10:59:04 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-05-30 12:16:10 +0200 |
| commit | 95911557371ab54e0215d701b1052882aaa14012 (patch) | |
| tree | 050990d2afa46ba7d3103e95b0e8b8025acfcefe | |
| parent | dc1b578a4cc1d7ec154a58baf3a813846c5adf9d (diff) | |
| download | upstream-95911557371ab54e0215d701b1052882aaa14012.tar.gz upstream-95911557371ab54e0215d701b1052882aaa14012.tar.bz2 upstream-95911557371ab54e0215d701b1052882aaa14012.zip | |
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 <hauke@hauke-m.de>
| -rw-r--r-- | target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch | 20 |
1 files 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 <abrodkin@synopsys.com> ;---------------------------------------------------------------- --- 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 <abrodkin@synopsys.com> 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 |