diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 07:05:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 07:05:02 -0700 |
| commit | b14db7abe3501524fd2b1b4ab328239cde42f567 (patch) | |
| tree | 21c57dd8b05a4db3dcdff2b1d62049e0bdb43aaf | |
| parent | 02c646ef4e9040aa538fa6ed22bb3fb502df5a77 (diff) | |
| parent | d5eda75f3a6a08f5a3644764a88d288e62e7823d (diff) | |
| download | linux-3.10-b14db7abe3501524fd2b1b4ab328239cde42f567.tar.gz linux-3.10-b14db7abe3501524fd2b1b4ab328239cde42f567.tar.bz2 linux-3.10-b14db7abe3501524fd2b1b4ab328239cde42f567.zip | |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
kbuild: fix LOCALVERSION handling to match description
kbuild: Fix modpost segfault
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | scripts/mod/modpost.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -944,7 +944,7 @@ ifdef CONFIG_LOCALVERSION_AUTO localver-extra = $(scm-identifier) else ifneq ($(scm-identifier),) - ifeq ($(LOCALVERSION),) + ifeq ("$(origin LOCALVERSION)", "undefined") localver-extra = + endif endif diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 3318692e4e7..f8779006986 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1342,7 +1342,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) |