Commit f1c3d73e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jessica Yu
Browse files

module: remove EXPORT_SYMBOL_GPL_FUTURE 



As far as I can tell this has never been used at all, and certainly
not any time recently.

Reviewed-by: default avatarMiroslav Benes <mbenes@suse.cz>
Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJessica Yu <jeyu@kernel.org>
parent 00cc2c1c

arch/x86/tools/relocs.c

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = { 
	"(__iommu_table|__apicdrivers|__smp_locks)(|_end)|"

	"__(start|end)_pci_.*|"

	"__(start|end)_builtin_fw|"

	"__(start|stop)___ksymtab(|_gpl|_unused|_unused_gpl|_gpl_future)|"

	"__(start|stop)___kcrctab(|_gpl|_unused|_unused_gpl|_gpl_future)|"

	"__(start|stop)___ksymtab(|_gpl|_unused|_unused_gpl)|"

	"__(start|stop)___kcrctab(|_gpl|_unused|_unused_gpl)|"

	"__(start|stop)___param|"

	"__(start|stop)___modver|"

	"__(start|stop)___bug_table|"

include/asm-generic/vmlinux.lds.h

+0 −14
Original line number Diff line number Diff line
@@ -495,13 +495,6 @@ 
		__stop___ksymtab_unused_gpl = .;			\

	}								\

									\

	/* Kernel symbol table: GPL-future-only symbols */		\

	__ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \

		__start___ksymtab_gpl_future = .;			\

		KEEP(*(SORT(___ksymtab_gpl_future+*)))			\

		__stop___ksymtab_gpl_future = .;			\

	}								\

									\

	/* Kernel symbol table: Normal symbols */			\

	__kcrctab         : AT(ADDR(__kcrctab) - LOAD_OFFSET) {		\

		__start___kcrctab = .;					\
@@ -530,13 +523,6 @@ 
		__stop___kcrctab_unused_gpl = .;			\

	}								\

									\

	/* Kernel symbol table: GPL-future-only symbols */		\

	__kcrctab_gpl_future : AT(ADDR(__kcrctab_gpl_future) - LOAD_OFFSET) { \

		__start___kcrctab_gpl_future = .;			\

		KEEP(*(SORT(___kcrctab_gpl_future+*)))			\

		__stop___kcrctab_gpl_future = .;			\

	}								\

									\

	/* Kernel symbol table: strings */				\

        __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {	\

		*(__ksymtab_strings)					\

include/linux/export.h

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ struct kernel_symbol { 


#define EXPORT_SYMBOL(sym)		_EXPORT_SYMBOL(sym, "")

#define EXPORT_SYMBOL_GPL(sym)		_EXPORT_SYMBOL(sym, "_gpl")

#define EXPORT_SYMBOL_GPL_FUTURE(sym)	_EXPORT_SYMBOL(sym, "_gpl_future")

#define EXPORT_SYMBOL_NS(sym, ns)	__EXPORT_SYMBOL(sym, "", #ns)

#define EXPORT_SYMBOL_NS_GPL(sym, ns)	__EXPORT_SYMBOL(sym, "_gpl", #ns)

include/linux/module.h

+0 −5
Original line number Diff line number Diff line
@@ -411,11 +411,6 @@ struct module { 


	bool async_probe_requested;



	/* symbols that will be GPL-only in the near future. */

	const struct kernel_symbol *gpl_future_syms;

	const s32 *gpl_future_crcs;

	unsigned int num_gpl_future_syms;



	/* Exception table */

	unsigned int num_exentries;

	struct exception_table_entry *extable;

kernel/module.c

+2 −27
Original line number Diff line number Diff line
@@ -408,11 +408,8 @@ extern const struct kernel_symbol __start___ksymtab[]; 
extern const struct kernel_symbol __stop___ksymtab[];

extern const struct kernel_symbol __start___ksymtab_gpl[];

extern const struct kernel_symbol __stop___ksymtab_gpl[];

extern const struct kernel_symbol __start___ksymtab_gpl_future[];

extern const struct kernel_symbol __stop___ksymtab_gpl_future[];

extern const s32 __start___kcrctab[];

extern const s32 __start___kcrctab_gpl[];

extern const s32 __start___kcrctab_gpl_future[];

#ifdef CONFIG_UNUSED_SYMBOLS

extern const struct kernel_symbol __start___ksymtab_unused[];

extern const struct kernel_symbol __stop___ksymtab_unused[];
@@ -434,7 +431,6 @@ struct symsearch { 
	enum mod_license {

		NOT_GPL_ONLY,

		GPL_ONLY,

		WILL_BE_GPL_ONLY,

	} license;

	bool unused;

};
@@ -458,15 +454,8 @@ static bool check_exported_symbol(const struct symsearch *syms, 
{

	struct find_symbol_arg *fsa = data;



	if (!fsa->gplok) {

		if (syms->license == GPL_ONLY)

	if (!fsa->gplok && syms->license == GPL_ONLY)

		return false;

		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);

		}

	}



#ifdef CONFIG_UNUSED_SYMBOLS

	if (syms->unused && fsa->warn) {
@@ -550,9 +539,6 @@ static bool find_symbol(struct find_symbol_arg *fsa) 
		{ __start___ksymtab_gpl, __stop___ksymtab_gpl,

		  __start___kcrctab_gpl,

		  GPL_ONLY, false },

		{ __start___ksymtab_gpl_future, __stop___ksymtab_gpl_future,

		  __start___kcrctab_gpl_future,

		  WILL_BE_GPL_ONLY, false },

#ifdef CONFIG_UNUSED_SYMBOLS

		{ __start___ksymtab_unused, __stop___ksymtab_unused,

		  __start___kcrctab_unused,
@@ -579,10 +565,6 @@ static bool find_symbol(struct find_symbol_arg *fsa) 
			{ mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,

			  mod->gpl_crcs,

			  GPL_ONLY, false },

			{ mod->gpl_future_syms,

			  mod->gpl_future_syms + mod->num_gpl_future_syms,

			  mod->gpl_future_crcs,

			  WILL_BE_GPL_ONLY, false },

#ifdef CONFIG_UNUSED_SYMBOLS

			{ mod->unused_syms,

			  mod->unused_syms + mod->num_unused_syms,
@@ -2292,7 +2274,6 @@ static int verify_exported_symbols(struct module *mod) 
	} arr[] = {

		{ mod->syms, mod->num_syms },

		{ mod->gpl_syms, mod->num_gpl_syms },

		{ mod->gpl_future_syms, mod->num_gpl_future_syms },

#ifdef CONFIG_UNUSED_SYMBOLS

		{ mod->unused_syms, mod->num_unused_syms },

		{ mod->unused_gpl_syms, mod->num_unused_gpl_syms },
@@ -3308,11 +3289,6 @@ static int find_module_sections(struct module *mod, struct load_info *info) 
				     sizeof(*mod->gpl_syms),

				     &mod->num_gpl_syms);

	mod->gpl_crcs = section_addr(info, "__kcrctab_gpl");

	mod->gpl_future_syms = section_objs(info,

					    "__ksymtab_gpl_future",

					    sizeof(*mod->gpl_future_syms),

					    &mod->num_gpl_future_syms);

	mod->gpl_future_crcs = section_addr(info, "__kcrctab_gpl_future");



#ifdef CONFIG_UNUSED_SYMBOLS

	mod->unused_syms = section_objs(info, "__ksymtab_unused",
@@ -3506,7 +3482,6 @@ static int check_module_license_and_versions(struct module *mod) 
#ifdef CONFIG_MODVERSIONS

	if ((mod->num_syms && !mod->crcs)

	    || (mod->num_gpl_syms && !mod->gpl_crcs)

	    || (mod->num_gpl_future_syms && !mod->gpl_future_crcs)

#ifdef CONFIG_UNUSED_SYMBOLS

	    || (mod->num_unused_syms && !mod->unused_crcs)

	    || (mod->num_unused_gpl_syms && !mod->unused_gpl_crcs)