lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2010-06-27 07:05:02 -07:00
parent 02c646ef4e d5eda75f3a
commit b14db7abe3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -944,7 +944,7 @@ ifdef CONFIG_LOCALVERSION_AUTO
localver-extra = $(scm-identifier) localver-extra = $(scm-identifier)
else else
ifneq ($(scm-identifier),) ifneq ($(scm-identifier),)
ifeq ($(LOCALVERSION),) ifeq ("$(origin LOCALVERSION)", "undefined")
localver-extra = + localver-extra = +
endif endif
endif endif

2
scripts/mod/modpost.c
View File

@@ -1342,7 +1342,7 @@ static unsigned int *reloc_location(struct elf_info *elf,
int section = sechdr->sh_info; int section = sechdr->sh_info;
return (void *)elf->hdr + sechdrs[section].sh_offset + 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) static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)