diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-08 16:38:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-08 16:38:42 -0400 |
commit | 601e7f024edbea8018de34c83a7398623214e636 (patch) | |
tree | 080fe3301f22374f0caba265bf3e1541d86d3366 /scripts/mod/modpost.c | |
parent | 6810b548b25114607e0814612d84125abccc0a4f (diff) |
Revert "kbuild: fix modpost segfault for 64bit mipsel kernel"
This reverts commit c8d8b837ebe4b4f11e1b0c4a2bdc358c697692ed, which
caused problems for the x86 build. Quoth Sam:
"It was discussed on mips list but apparently the fix was bogus. I
will not have time to look into it so mips can carry this local fix
until we get a proper fix in mainline."
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'scripts/mod/modpost.c')
-rw-r--r-- | scripts/mod/modpost.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index b36e884f5f96..6d04504b2fc1 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
@@ -709,17 +709,10 @@ static void check_sec_ref(struct module *mod, const char *modname, | |||
709 | for (rela = start; rela < stop; rela++) { | 709 | for (rela = start; rela < stop; rela++) { |
710 | Elf_Rela r; | 710 | Elf_Rela r; |
711 | const char *secname; | 711 | const char *secname; |
712 | unsigned int r_sym; | ||
713 | r.r_offset = TO_NATIVE(rela->r_offset); | 712 | r.r_offset = TO_NATIVE(rela->r_offset); |
714 | if (hdr->e_ident[EI_CLASS] == ELFCLASS64 && | 713 | r.r_info = TO_NATIVE(rela->r_info); |
715 | hdr->e_machine == EM_MIPS) { | ||
716 | r_sym = ELF64_MIPS_R_SYM(rela->r_info); | ||
717 | r_sym = TO_NATIVE(r_sym); | ||
718 | } else { | ||
719 | r_sym = ELF_R_SYM(TO_NATIVE(rela->r_info)); | ||
720 | } | ||
721 | r.r_addend = TO_NATIVE(rela->r_addend); | 714 | r.r_addend = TO_NATIVE(rela->r_addend); |
722 | sym = elf->symtab_start + r_sym; | 715 | sym = elf->symtab_start + ELF_R_SYM(r.r_info); |
723 | /* Skip special sections */ | 716 | /* Skip special sections */ |
724 | if (sym->st_shndx >= SHN_LORESERVE) | 717 | if (sym->st_shndx >= SHN_LORESERVE) |
725 | continue; | 718 | continue; |