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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild 

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
  kbuild: scripts/Makefile.modpost typo fix
  kbuild: soften MODULE_LICENSE check
parents 9b79ed95 f5093913

scripts/Makefile.modpost

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ modpost = scripts/mod/modpost \ 
 $(if $(CONFIG_MODULE_SRCVERSION_ALL),-a,)       \

 $(if $(KBUILD_EXTMOD),-i,-o) $(kernelsymfile)   \

 $(if $(KBUILD_EXTMOD),-I $(modulesymfile))      \

 $(if $(iKBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(EXTRA_SYMBOLS))) \

 $(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(EXTRA_SYMBOLS))) \

 $(if $(KBUILD_EXTMOD),-o $(modulesymfile))      \

 $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \

 $(if $(CONFIG_MARKERS),-K $(kernelmarkersfile)) \

scripts/mod/modpost.c

+4 −4
Original line number Diff line number Diff line
@@ -1552,8 +1552,8 @@ static void read_symbols(char *modname) 
	}



	license = get_modinfo(info.modinfo, info.modinfo_len, "license");

	if (!license && !is_vmlinux(modname))

		fatal("modpost: missing MODULE_LICENSE() in %s\n"

	if (info.modinfo && !license && !is_vmlinux(modname))

		warn("modpost: missing MODULE_LICENSE() in %s\n"

		     "see include/linux/module.h for "

		     "more information\n", modname);

	while (license) {