You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From 819b4bda18d62b52d04789c4a8d4fc3fbf9ce242 Mon Sep 17 00:00:00 2001
|
|
From: Gabor Juhos <juhosg@openwrt.org>
|
|
Date: Mon, 13 Jul 2009 10:46:49 +0200
|
|
Subject: [PATCH] MIPS: fix loading of modules with unresolved weak symbols
|
|
|
|
Loading of modules with unresolved weak symbols fails on MIPS
|
|
since '88173507e4fc1e7ecd111b0565e8cba0cb7dae6d'.
|
|
|
|
Modules: handle symbols that have a zero value
|
|
|
|
The module subsystem cannot handle symbols that are zero. If symbols
|
|
are present that have a zero value then the module resolver prints out a
|
|
message that these symbols are unresolved.
|
|
|
|
We have to use IS_ERR_VALUE() to check that a symbol has been resolved
|
|
or not.
|
|
|
|
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|
---
|
|
arch/mips/kernel/module.c | 4 ++--
|
|
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/arch/mips/kernel/module.c
|
|
+++ b/arch/mips/kernel/module.c
|
|
@@ -303,7 +303,7 @@ int apply_relocate(Elf_Shdr *sechdrs, co
|
|
/* This is the symbol it is referring to */
|
|
sym = (Elf_Sym *)sechdrs[symindex].sh_addr
|
|
+ ELF_MIPS_R_SYM(rel[i]);
|
|
- if (!sym->st_value) {
|
|
+ if (IS_ERR_VALUE(sym->st_value)) {
|
|
/* Ignore unresolved weak symbol */
|
|
if (ELF_ST_BIND(sym->st_info) == STB_WEAK)
|
|
continue;
|
|
@@ -343,7 +343,7 @@ int apply_relocate_add(Elf_Shdr *sechdrs
|
|
/* This is the symbol it is referring to */
|
|
sym = (Elf_Sym *)sechdrs[symindex].sh_addr
|
|
+ ELF_MIPS_R_SYM(rel[i]);
|
|
- if (!sym->st_value) {
|
|
+ if (IS_ERR_VALUE(sym->st_value)) {
|
|
/* Ignore unresolved weak symbol */
|
|
if (ELF_ST_BIND(sym->st_info) == STB_WEAK)
|
|
continue;
|