diff options
| -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 | |||
| 944 | localver-extra = $(scm-identifier) | 944 | localver-extra = $(scm-identifier) |
| 945 | else | 945 | else |
| 946 | ifneq ($(scm-identifier),) | 946 | ifneq ($(scm-identifier),) |
| 947 | ifeq ($(LOCALVERSION),) | 947 | ifeq ("$(origin LOCALVERSION)", "undefined") |
| 948 | localver-extra = + | 948 | localver-extra = + |
| 949 | endif | 949 | endif |
| 950 | endif | 950 | 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, | |||
| 1342 | int section = sechdr->sh_info; | 1342 | int section = sechdr->sh_info; |
| 1343 | 1343 | ||
| 1344 | return (void *)elf->hdr + sechdrs[section].sh_offset + | 1344 | return (void *)elf->hdr + sechdrs[section].sh_offset + |
| 1345 | (r->r_offset - sechdrs[section].sh_addr); | 1345 | r->r_offset - sechdrs[section].sh_addr; |
| 1346 | } | 1346 | } |
| 1347 | 1347 | ||
| 1348 | static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) | 1348 | static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) |
