diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-26 14:03:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-26 14:03:54 -0700 |
| commit | e3505dd50caf54e6f81f897cb347441409974a15 (patch) | |
| tree | 3519b3e61d040f6c6874e5199ca640b3868f2407 | |
| parent | 9b79ed952bd7344d40152f8a560ad8a0d93f3886 (diff) | |
| parent | f5093913c0b5b93e3ccafd39d056e76557169ced (diff) | |
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
| -rw-r--r-- | scripts/Makefile.modpost | 2 | ||||
| -rw-r--r-- | scripts/mod/modpost.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 24b3c8fe6bc..a098a0454dc 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -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)) \ diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index f8b42ab0724..757294b4f32 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1552,10 +1552,10 @@ 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" - "see include/linux/module.h for " - "more information\n", modname); + 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) { if (license_is_gpl_compatible(license)) mod->gpl_compatible = 1; |