Commit 8ed7e33a authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

linux/export.h: rename 'sec' argument to 'license' 



Now, EXPORT_SYMBOL() is populated in two stages. In the first stage,
all of EXPORT_SYMBOL/EXPORT_SYMBOL_GPL go into the same section,
'.export_symbol'.

'sec' does not make sense any more. Rename it to 'license'.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
parent f2346278

include/linux/export.h

+4 −4
Original line number Diff line number Diff line
@@ -57,11 +57,11 @@ extern struct module __this_module; 
 * be reused in other execution contexts such as the UEFI stub or the

 * decompressor.

 */

#define __EXPORT_SYMBOL(sym, sec, ns)

#define __EXPORT_SYMBOL(sym, license, ns)



#elif defined(__GENKSYMS__)



#define __EXPORT_SYMBOL(sym, sec, ns)	__GENKSYMS_EXPORT_SYMBOL(sym)

#define __EXPORT_SYMBOL(sym, license, ns)	__GENKSYMS_EXPORT_SYMBOL(sym)



#elif defined(__ASSEMBLY__)
@@ -78,9 +78,9 @@ extern struct module __this_module; 
#endif /* CONFIG_MODULES */



#ifdef DEFAULT_SYMBOL_NAMESPACE

#define _EXPORT_SYMBOL(sym, sec)	__EXPORT_SYMBOL(sym, sec, __stringify(DEFAULT_SYMBOL_NAMESPACE))

#define _EXPORT_SYMBOL(sym, license)	__EXPORT_SYMBOL(sym, license, __stringify(DEFAULT_SYMBOL_NAMESPACE))

#else

#define _EXPORT_SYMBOL(sym, sec)	__EXPORT_SYMBOL(sym, sec, "")

#define _EXPORT_SYMBOL(sym, license)	__EXPORT_SYMBOL(sym, license, "")

#endif



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

include/linux/pm.h

+3 −3
Original line number Diff line number Diff line
@@ -375,14 +375,14 @@ const struct dev_pm_ops name = { \ 
}



#ifdef CONFIG_PM

#define _EXPORT_DEV_PM_OPS(name, sec, ns)				\

#define _EXPORT_DEV_PM_OPS(name, license, ns)				\

	const struct dev_pm_ops name;					\

	__EXPORT_SYMBOL(name, sec, ns);					\

	__EXPORT_SYMBOL(name, license, ns);				\

	const struct dev_pm_ops name

#define EXPORT_PM_FN_GPL(name)		EXPORT_SYMBOL_GPL(name)

#define EXPORT_PM_FN_NS_GPL(name, ns)	EXPORT_SYMBOL_NS_GPL(name, ns)

#else

#define _EXPORT_DEV_PM_OPS(name, sec, ns)				\

#define _EXPORT_DEV_PM_OPS(name, license, ns)				\

	static __maybe_unused const struct dev_pm_ops __static_##name

#define EXPORT_PM_FN_GPL(name)

#define EXPORT_PM_FN_NS_GPL(name, ns)