Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35601d50 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJessica Yu <jeyu@kernel.org>
(cherry picked from commit cd8732cdcc37d7077c4fa2c966b748c0662b607e)
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I0ad6d1dcbe39053566bb922b9a71359f753df85c
parent 684d5eaf

include/linux/module.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -577,7 +577,7 @@ struct symsearch { 
		NOT_GPL_ONLY,

		NOT_GPL_ONLY,

		GPL_ONLY,

		GPL_ONLY,

		WILL_BE_GPL_ONLY,

		WILL_BE_GPL_ONLY,

	} licence;

	} license;

	bool unused;

	bool unused;

};

};

kernel/module.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -501,9 +501,9 @@ static bool check_exported_symbol(const struct symsearch *syms, 
	struct find_symbol_arg *fsa = data;

	struct find_symbol_arg *fsa = data;





	if (!fsa->gplok) {

	if (!fsa->gplok) {

		if (syms->licence == GPL_ONLY)

		if (syms->license == GPL_ONLY)

			return false;

			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, "

			pr_warn("Symbol %s is being used by a non-GPL module, "

				"which will not be allowed in the future\n",

				"which will not be allowed in the future\n",

				fsa->name);

				fsa->name);