From 35601d50151b2cd29a357ab85f9ff0222af9877e Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Thu, 30 Jul 2020 08:10:25 +0200 Subject: [PATCH] UPSTREAM: modules: rename the licence field in struct symsearch to license Use the same spelling variant as the rest of the file. Bug: 157965270 Bug: 171277690 Signed-off-by: Christoph Hellwig Signed-off-by: Jessica Yu (cherry picked from commit cd8732cdcc37d7077c4fa2c966b748c0662b607e) Signed-off-by: Greg Kroah-Hartman Change-Id: I0ad6d1dcbe39053566bb922b9a71359f753df85c --- 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 70750f8856e1..3926d5ae1ff1 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -577,7 +577,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 9ca9fe6c4307..077aec753bb7 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -501,9 +501,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);