diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 18:06:06 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 18:06:06 -0500 |
| commit | 56dbed129df3fdd4caf9018b6e7599ee258a5420 (patch) | |
| tree | b902491aef3a99efe0d9d49edd0f6e414dba654f /scripts/mod | |
| parent | 2a2d31c8dc6f1ebcf5eab1d93a0cb0fb4ed57c7c (diff) | |
| parent | f878133bf022717b880d0e0995b8f91436fd605c (diff) | |
Merge branch 'linus' into idle-test
Diffstat (limited to 'scripts/mod')
| -rw-r--r-- | scripts/mod/modpost.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 33122ca04e7c..97d2259ae999 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
| @@ -790,6 +790,7 @@ static const char *section_white_list[] = | |||
| 790 | { | 790 | { |
| 791 | ".comment*", | 791 | ".comment*", |
| 792 | ".debug*", | 792 | ".debug*", |
| 793 | ".zdebug*", /* Compressed debug sections. */ | ||
| 793 | ".GCC-command-line", /* mn10300 */ | 794 | ".GCC-command-line", /* mn10300 */ |
| 794 | ".mdebug*", /* alpha, score, mips etc. */ | 795 | ".mdebug*", /* alpha, score, mips etc. */ |
| 795 | ".pdr", /* alpha, score, mips etc. */ | 796 | ".pdr", /* alpha, score, mips etc. */ |
| @@ -1441,7 +1442,7 @@ static unsigned int *reloc_location(struct elf_info *elf, | |||
| 1441 | int section = shndx2secindex(sechdr->sh_info); | 1442 | int section = shndx2secindex(sechdr->sh_info); |
| 1442 | 1443 | ||
| 1443 | return (void *)elf->hdr + sechdrs[section].sh_offset + | 1444 | return (void *)elf->hdr + sechdrs[section].sh_offset + |
| 1444 | r->r_offset - sechdrs[section].sh_addr; | 1445 | r->r_offset; |
| 1445 | } | 1446 | } |
| 1446 | 1447 | ||
| 1447 | static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) | 1448 | static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) |