74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
27 lines
770 B
Diff
27 lines
770 B
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Subject: fix errors in unresolved weak symbols on arm
|
|
|
|
lede-commit: 570699d4838a907c3ef9f2819bf19eb72997b32f
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
arch/arm/kernel/module.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
|
|
index 4f14b5ce6535..4b4b0461663f 100644
|
|
--- a/arch/arm/kernel/module.c
|
|
+++ b/arch/arm/kernel/module.c
|
|
@@ -88,6 +88,10 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
|
|
return -ENOEXEC;
|
|
}
|
|
|
|
+ if ((IS_ERR_VALUE(sym->st_value) || !sym->st_value) &&
|
|
+ ELF_ST_BIND(sym->st_info) == STB_WEAK)
|
|
+ continue;
|
|
+
|
|
loc = dstsec->sh_addr + rel->r_offset;
|
|
|
|
switch (ELF32_R_TYPE(rel->r_info)) {
|
|
--
|
|
2.11.0
|
|
|