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

2 files changed, 2 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index d49d96c35ce5..662e820cfc4a 100644
--- a/Makefile
+++ b/Makefile
@@ -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 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,
         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)