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

Commit 04c85f75 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

modules: rename the licence field in struct symsearch to license 



commit cd8732cdcc37d7077c4fa2c966b748c0662b607e upstream.

Use the same spelling variant as the rest of the file.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJessica Yu <jeyu@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 27b700c2

include/linux/module.h

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

		GPL_ONLY,

		WILL_BE_GPL_ONLY,

	} licence;

	} license;

	bool unused;

};

kernel/module.c

+2 −2
Original line number Diff line number Diff line
@@ -496,9 +496,9 @@ static bool check_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);