[PATCH 4.19 124/425] modules: rename the licence field in struct symsearch to license
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2021-05-20 09:47:05
Also in:
lkml
From: Christoph Hellwig <hch@lst.de> 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> --- include/linux/module.h | 2 +- kernel/module.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
--- 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; }; --- a/kernel/module.c +++ b/kernel/module.c
@@ -496,9 +496,9 @@ static bool check_symbol(const struct sy 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);