Commit b14db7ab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 02c646ef d5eda75f

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

scripts/mod/modpost.c

+1 −1
Original line number Diff line number Diff line
@@ -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)