summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-07-30 08:10:25 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-22 10:59:23 +0200
commit04c85f758849657691dde9fce66d18eee7a9ae8f (patch)
treee6b751869eeb3911adb672951ea0fa349234d6d0
parent27b700c23227594e715e9d06a57521659dafa105 (diff)
modules: rename the licence field in struct symsearch to license
commit cd8732cdcc37d7077c4fa2c966b748c0662b607e upstream. Use the same spelling variant as the rest of the file. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jessica Yu <jeyu@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--include/linux/module.h2
-rw-r--r--kernel/module.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/module.h b/include/linux/module.h
index f8d2f81b1956..4fbee306ea82 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -533,7 +533,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 bbbeb5614c57..14f81291c682 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -496,9 +496,9 @@ static bool check_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);