[SRU][B][PATCH 3/8] UBUNTU: SAUCE: Revert "modules: rename the licence field in struct symsearch to license"

[Ian May]

BugLink: https://bugs.launchpad.net/bugs/1932065

This reverts commit f195473638ab5ea6350c9eb547ac8cd2dca94bd6.

Upstream introduced 'module' patches that removed exported symbols
that might cause potential disruption and breakage for customers.

Reverting as SAUCE patches to prevent regressions.

Signed-off-by: Ian May <ian.may at canonical.com>
---
 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 0232bef654ed..605ced6af2f8 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -526,7 +526,7 @@ struct symsearch {
 		NOT_GPL_ONLY,
 		GPL_ONLY,
 		WILL_BE_GPL_ONLY,
-	} license;
+	} licence;
 	bool unused;
 };
 
diff --git a/kernel/module.c b/kernel/module.c
index d6ae25976cea..91a63a13fdca 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -516,9 +516,9 @@ static bool check_symbol(const struct symsearch *syms,
 	struct find_symbol_arg *fsa = data;
 
 	if (!fsa->gplok) {
-		if (syms->license == GPL_ONLY)
+		if (syms->licence == GPL_ONLY)
 			return false;
-		if (syms->license == WILL_BE_GPL_ONLY && fsa->warn) {
+		if (syms->licence == 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.25.1