diff --git a/Makefile b/Makefile index 2267390c9421..0c19df930c3c 100644 --- a/Makefile +++ b/Makefile @@ -1210,8 +1210,7 @@ define filechk_utsrelease.h echo '"$(KERNELRELEASE)" exceeds $(uts_len) characters' >&2; \ exit 1; \ fi; \ - (echo \#define UTS_RELEASE \"$(KERNELRELEASE)\"; echo \#define UTS_RELEASE_FULL \"$(KERNELRELEASE_FULL)\";\ - echo \#define UTS_RELEASEY \"$(basename $(KERNELRELEASE)).y\";) + (echo \#define UTS_RELEASE \"$(KERNELRELEASE)\"; echo \#define UTS_RELEASE_FULL \"$(KERNELRELEASE_FULL)\";) endef define filechk_version.h diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h index f678d9538a9f..6f8fbcf10dfb 100644 --- a/include/linux/vermagic.h +++ b/include/linux/vermagic.h @@ -26,7 +26,7 @@ #endif #define VERMAGIC_STRING \ - UTS_RELEASEY " " \ + UTS_RELEASE " " \ MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \ MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \ MODULE_ARCH_VERMAGIC diff --git a/kernel/module.c b/kernel/module.c index be3b4356e5f8..13ad2f8c44f9 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -1308,7 +1308,7 @@ static int check_version(Elf_Shdr *sechdrs, bad_version: pr_warn("%s: disagrees about version of symbol %s\n", mod->name, symname); - return 1; + return 0; } static inline int check_modstruct_version(Elf_Shdr *sechdrs,