diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
| commit | a2262d8a231e92742651859a10c9a4430a5e899a (patch) | |
| tree | b5a823e3f6a3f60e1dd995f113caf0b350228d84 /scripts/mod/modpost.c | |
| parent | ef06f55a5c936a395f3ee2e1237bbebdb4396c65 (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'scripts/mod/modpost.c')
| -rw-r--r-- | scripts/mod/modpost.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 3318692e4e76..f8779006986d 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
| @@ -1342,7 +1342,7 @@ static unsigned int *reloc_location(struct elf_info *elf, | |||
| 1342 | int section = sechdr->sh_info; | 1342 | int section = sechdr->sh_info; |
| 1343 | 1343 | ||
| 1344 | return (void *)elf->hdr + sechdrs[section].sh_offset + | 1344 | return (void *)elf->hdr + sechdrs[section].sh_offset + |
| 1345 | (r->r_offset - sechdrs[section].sh_addr); | 1345 | r->r_offset - sechdrs[section].sh_addr; |
| 1346 | } | 1346 | } |
| 1347 | 1347 | ||
| 1348 | static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) | 1348 | static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) |