summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-08-03 11:04:34 +0200
committerThomas Gleixner <tglx@linutronix.de>2010-08-03 11:04:34 +0200
commitc88417fd85d1a2d01d3f5a6b1b10c4e5d26e7436 (patch)
tree9e9d53b10f705b6b6b5eaf178a90a21779b3d6d7 /scripts
parentcd4e15ad91d24bdffc6c4cb5f05be916154229a3 (diff)
parent15b059e0f9e31f0e7f6b5397368054c005949fea (diff)
downloadlwn-c88417fd85d1a2d01d3f5a6b1b10c4e5d26e7436.tar.gz
lwn-c88417fd85d1a2d01d3f5a6b1b10c4e5d26e7436.zip
Merge stable update
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.33.y Conflicts: Makefile Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mod/modpost.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 20923613467c..17c95a384285 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1318,7 +1318,7 @@ static unsigned int *reloc_location(struct elf_info *elf,
int section = sechdr->sh_info;
return (void *)elf->hdr + sechdrs[section].sh_offset +
- (r->r_offset - sechdrs[section].sh_addr);
+ r->r_offset - sechdrs[section].sh_addr;
}
static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)