diff mbox series

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

Message ID 20210617203917.1583344-4-ian.may@canonical.com
State New
Headers show
Series [SRU,G,1/8] UBUNTU: SAUCE: Revert "modules: inherit TAINT_PROPRIETARY_MODULE" | expand

Commit Message

Ian May June 17, 2021, 8:39 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1932065

This reverts commit e63bce648bdcd094a42da9bf45a89a68403a0636.

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@canonical.com>
---
 include/linux/module.h | 2 +-
 kernel/module.c        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/include/linux/module.h b/include/linux/module.h
index be04ba2f881d..b79219eed83c 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,
-	} license;
+	} licence;
 	bool unused;
 };
 
diff --git a/kernel/module.c b/kernel/module.c
index 03e0170a0d65..9ebcdab96b43 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -505,9 +505,9 @@  static bool check_exported_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);