| Message ID | 20230608142428.256985-12-masahiroy@kernel.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Unify <linux/export.h> and <asm/export.h>, remove EXPORT_DATA_SYMBOL(), faster TRIM_UNUSED_KSYMS | expand |
On Thu, Jun 8, 2023 at 7:24 AM Masahiro Yamada <masahiroy@kernel.org> wrote: > > 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: Masahiro Yamada <masahiroy@kernel.org> Thanks for the patch! Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> > --- > > Changes in v7: > - New patch > > include/linux/export.h | 8 ++++---- > include/linux/pm.h | 6 +++--- > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/include/linux/export.h b/include/linux/export.h > index fed2e5717461..b411fdb88720 100644 > --- a/include/linux/export.h > +++ b/include/linux/export.h > @@ -46,11 +46,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__) > > @@ -67,9 +67,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,) > diff --git a/include/linux/pm.h b/include/linux/pm.h > index aabb6bd8f89e..1810d776e84a 100644 > --- a/include/linux/pm.h > +++ b/include/linux/pm.h > @@ -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) > -- > 2.39.2 >
diff --git a/include/linux/export.h b/include/linux/export.h index fed2e5717461..b411fdb88720 100644 --- a/include/linux/export.h +++ b/include/linux/export.h @@ -46,11 +46,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__) @@ -67,9 +67,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,) diff --git a/include/linux/pm.h b/include/linux/pm.h index aabb6bd8f89e..1810d776e84a 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -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)
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: Masahiro Yamada <masahiroy@kernel.org> --- Changes in v7: - New patch include/linux/export.h | 8 ++++---- include/linux/pm.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-)