From: Christoph Hellwig <hch@lst.de>
To: Jessica Yu <jeyu@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 6/8] modules: rename the licence field in struct symsearch to license
Date: Thu, 30 Jul 2020 08:10:25 +0200 [thread overview]
Message-ID: <20200730061027.29472-7-hch@lst.de> (raw)
In-Reply-To: <20200730061027.29472-1-hch@lst.de>
Use the same spelling variant as the rest of the file.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
include/linux/module.h | 2 +-
kernel/module.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/linux/module.h b/include/linux/module.h
index b79219eed83c56..be04ba2f881daa 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -586,7 +586,7 @@ struct symsearch {
NOT_GPL_ONLY,
GPL_ONLY,
WILL_BE_GPL_ONLY,
- } licence;
+ } license;
bool unused;
};
diff --git a/kernel/module.c b/kernel/module.c
index 54e853c7212f72..a0df783a8a6e5b 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -504,9 +504,9 @@ static bool check_exported_symbol(const struct symsearch *syms,
struct find_symbol_arg *fsa = data;
if (!fsa->gplok) {
- if (syms->licence == GPL_ONLY)
+ if (syms->license == GPL_ONLY)
return false;
- if (syms->licence == WILL_BE_GPL_ONLY && fsa->warn) {
+ if (syms->license == WILL_BE_GPL_ONLY && fsa->warn) {
pr_warn("Symbol %s is being used by a non-GPL module, "
"which will not be allowed in the future\n",
fsa->name);
--
2.27.0
next prev parent reply other threads:[~2020-07-30 6:10 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 6:10 inherit TAINT_PROPRIETARY_MODULE v2 Christoph Hellwig
2020-07-30 6:10 ` [PATCH 1/8] modules: mark ref_module static Christoph Hellwig
2020-07-30 6:10 ` [PATCH 2/8] modules: mark find_symbol static Christoph Hellwig
2020-07-30 6:10 ` [PATCH 3/8] modules: mark each_symbol_section static Christoph Hellwig
2020-07-30 6:10 ` [PATCH 4/8] modules: unexport __module_text_address Christoph Hellwig
2020-07-30 6:10 ` [PATCH 5/8] modules: unexport __module_address Christoph Hellwig
2020-07-30 6:10 ` Christoph Hellwig [this message]
2020-07-30 6:10 ` [PATCH 7/8] modules: return licensing information from find_symbol Christoph Hellwig
2020-07-30 6:10 ` [PATCH 8/8] modules: inherit TAINT_PROPRIETARY_MODULE Christoph Hellwig
2020-07-30 14:12 ` Jessica Yu
2020-07-30 16:29 ` Christoph Hellwig
2020-07-31 8:51 ` Jessica Yu
2020-07-31 9:00 ` Christoph Hellwig
2020-07-31 9:01 ` Jessica Yu
2020-08-04 18:52 ` daniel
2020-07-31 20:11 ` inherit TAINT_PROPRIETARY_MODULE v2 josh
2020-08-01 6:53 ` Christoph Hellwig
2020-08-01 8:16 ` Josh Triplett
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200730061027.29472-7-hch@lst.de \
--to=hch@lst.de \
--cc=gregkh@linuxfoundation.org \
--cc=jeyu@kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).