Commit 1be5fa6c authored by Masahiro Yamada's avatar Masahiro Yamada

modpost: remove is_vmlinux() call in check_for_{gpl_usage,unused}()

check_exports() is never called for vmlinux because mod->skip is set
for vmlinux.

Hence, check_for_gpl_usage() and check_for_unused() are not called
for vmlinux, either. is_vmlinux() is always false here.

Remove the is_vmlinux() calls, and hard-code the ".ko" suffix.
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 3379576d
...@@ -2144,20 +2144,18 @@ void buf_write(struct buffer *buf, const char *s, int len) ...@@ -2144,20 +2144,18 @@ void buf_write(struct buffer *buf, const char *s, int len)
static void check_for_gpl_usage(enum export exp, const char *m, const char *s) static void check_for_gpl_usage(enum export exp, const char *m, const char *s)
{ {
const char *e = is_vmlinux(m) ?"":".ko";
switch (exp) { switch (exp) {
case export_gpl: case export_gpl:
fatal("GPL-incompatible module %s%s " fatal("GPL-incompatible module %s.ko uses GPL-only symbol '%s'\n",
"uses GPL-only symbol '%s'\n", m, e, s); m, s);
break; break;
case export_unused_gpl: case export_unused_gpl:
fatal("GPL-incompatible module %s%s " fatal("GPL-incompatible module %s.ko uses GPL-only symbol marked UNUSED '%s'\n",
"uses GPL-only symbol marked UNUSED '%s'\n", m, e, s); m, s);
break; break;
case export_gpl_future: case export_gpl_future:
warn("GPL-incompatible module %s%s " warn("GPL-incompatible module %s.ko uses future GPL-only symbol '%s'\n",
"uses future GPL-only symbol '%s'\n", m, e, s); m, s);
break; break;
case export_plain: case export_plain:
case export_unused: case export_unused:
...@@ -2169,13 +2167,11 @@ static void check_for_gpl_usage(enum export exp, const char *m, const char *s) ...@@ -2169,13 +2167,11 @@ static void check_for_gpl_usage(enum export exp, const char *m, const char *s)
static void check_for_unused(enum export exp, const char *m, const char *s) static void check_for_unused(enum export exp, const char *m, const char *s)
{ {
const char *e = is_vmlinux(m) ?"":".ko";
switch (exp) { switch (exp) {
case export_unused: case export_unused:
case export_unused_gpl: case export_unused_gpl:
warn("module %s%s " warn("module %s.ko uses symbol '%s' marked UNUSED\n",
"uses symbol '%s' marked UNUSED\n", m, e, s); m, s);
break; break;
default: default:
/* ignore */ /* ignore */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment