Skip to content

Commit 8ed7e33

Browse files
committed
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: Masahiro Yamada <[email protected]> Reviewed-by: Nick Desaulniers <[email protected]>
1 parent f234627 commit 8ed7e33

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

include/linux/export.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ extern struct module __this_module;
5757
* be reused in other execution contexts such as the UEFI stub or the
5858
* decompressor.
5959
*/
60-
#define __EXPORT_SYMBOL(sym, sec, ns)
60+
#define __EXPORT_SYMBOL(sym, license, ns)
6161

6262
#elif defined(__GENKSYMS__)
6363

64-
#define __EXPORT_SYMBOL(sym, sec, ns) __GENKSYMS_EXPORT_SYMBOL(sym)
64+
#define __EXPORT_SYMBOL(sym, license, ns) __GENKSYMS_EXPORT_SYMBOL(sym)
6565

6666
#elif defined(__ASSEMBLY__)
6767

@@ -78,9 +78,9 @@ extern struct module __this_module;
7878
#endif /* CONFIG_MODULES */
7979

8080
#ifdef DEFAULT_SYMBOL_NAMESPACE
81-
#define _EXPORT_SYMBOL(sym, sec) __EXPORT_SYMBOL(sym, sec, __stringify(DEFAULT_SYMBOL_NAMESPACE))
81+
#define _EXPORT_SYMBOL(sym, license) __EXPORT_SYMBOL(sym, license, __stringify(DEFAULT_SYMBOL_NAMESPACE))
8282
#else
83-
#define _EXPORT_SYMBOL(sym, sec) __EXPORT_SYMBOL(sym, sec, "")
83+
#define _EXPORT_SYMBOL(sym, license) __EXPORT_SYMBOL(sym, license, "")
8484
#endif
8585

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

include/linux/pm.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,14 +375,14 @@ const struct dev_pm_ops name = { \
375375
}
376376

377377
#ifdef CONFIG_PM
378-
#define _EXPORT_DEV_PM_OPS(name, sec, ns) \
378+
#define _EXPORT_DEV_PM_OPS(name, license, ns) \
379379
const struct dev_pm_ops name; \
380-
__EXPORT_SYMBOL(name, sec, ns); \
380+
__EXPORT_SYMBOL(name, license, ns); \
381381
const struct dev_pm_ops name
382382
#define EXPORT_PM_FN_GPL(name) EXPORT_SYMBOL_GPL(name)
383383
#define EXPORT_PM_FN_NS_GPL(name, ns) EXPORT_SYMBOL_NS_GPL(name, ns)
384384
#else
385-
#define _EXPORT_DEV_PM_OPS(name, sec, ns) \
385+
#define _EXPORT_DEV_PM_OPS(name, license, ns) \
386386
static __maybe_unused const struct dev_pm_ops __static_##name
387387
#define EXPORT_PM_FN_GPL(name)
388388
#define EXPORT_PM_FN_NS_GPL(name, ns)

0 commit comments

Comments
 (0)