summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.1/310-arm_module_unresolved_weak_sym.patch
diff options
context:
space:
mode:
authorjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-08-09 12:19:43 +0000
committerjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-08-09 12:19:43 +0000
commitb460d9e23fe468d9d59394ea86f631150006ff6c (patch)
treecc4ae0400759c09d1eb08510f89711899bf63bce /target/linux/generic/patches-3.1/310-arm_module_unresolved_weak_sym.patch
parentb73001d417a22438012ab9d0355180e6ca0818b3 (diff)
linux: generic: add support for 3.1-rc1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27940 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.1/310-arm_module_unresolved_weak_sym.patch')
-rw-r--r--target/linux/generic/patches-3.1/310-arm_module_unresolved_weak_sym.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.1/310-arm_module_unresolved_weak_sym.patch b/target/linux/generic/patches-3.1/310-arm_module_unresolved_weak_sym.patch
new file mode 100644
index 000000000..d1eba5503
--- /dev/null
+++ b/target/linux/generic/patches-3.1/310-arm_module_unresolved_weak_sym.patch
@@ -0,0 +1,13 @@
+--- a/arch/arm/kernel/module.c
++++ b/arch/arm/kernel/module.c
+@@ -81,6 +81,10 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
+ 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)) {