diff mbox series

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

Message ID 20210615220408.1407292-4-ian.may@canonical.com
State New
Headers show
Series UBUNTU: SAUCE: Revert upstream 'module' patches that removed exported symbols | expand

Commit Message

Ian May June 15, 2021, 10:04 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1932065

This reverts commit f5f30499771cd1557a52c1809d9ebefabdb854a4.

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

Temporarily reverting as SAUCE patches to allow customers time to
make necessary changes to support patch changes.

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 ab9a0912ce1f..37468023b219 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -565,7 +565,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 2da1fdeaadae..8fe335d8b5f3 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -502,9 +502,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);