diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
| commit | ea4d65f14f6aaa53e379b93c5544245ef081b3e7 (patch) | |
| tree | a15485f4f1cf547a52b31fa8e16e14b9579b7200 /include/linux/module.h | |
| parent | ce32d59ee2cd036f6e8a6ed17a06a0b0bec5c67c (diff) | |
| parent | 496f3347d834aec91c38b45d6249ed00f58ad233 (diff) | |
Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index d44df9b2c131..f807f15bebbe 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
| @@ -266,7 +266,7 @@ extern int modules_disabled; /* for sysctl */ | |||
| 266 | /* Get/put a kernel symbol (calls must be symmetric) */ | 266 | /* Get/put a kernel symbol (calls must be symmetric) */ |
| 267 | void *__symbol_get(const char *symbol); | 267 | void *__symbol_get(const char *symbol); |
| 268 | void *__symbol_get_gpl(const char *symbol); | 268 | void *__symbol_get_gpl(const char *symbol); |
| 269 | #define symbol_get(x) ((typeof(&x))(__symbol_get(VMLINUX_SYMBOL_STR(x)))) | 269 | #define symbol_get(x) ((typeof(&x))(__symbol_get(__stringify(x)))) |
| 270 | 270 | ||
| 271 | /* modules using other modules: kdb wants to see this. */ | 271 | /* modules using other modules: kdb wants to see this. */ |
| 272 | struct module_use { | 272 | struct module_use { |
| @@ -575,7 +575,7 @@ extern void __noreturn __module_put_and_exit(struct module *mod, | |||
| 575 | #ifdef CONFIG_MODULE_UNLOAD | 575 | #ifdef CONFIG_MODULE_UNLOAD |
| 576 | int module_refcount(struct module *mod); | 576 | int module_refcount(struct module *mod); |
| 577 | void __symbol_put(const char *symbol); | 577 | void __symbol_put(const char *symbol); |
| 578 | #define symbol_put(x) __symbol_put(VMLINUX_SYMBOL_STR(x)) | 578 | #define symbol_put(x) __symbol_put(__stringify(x)) |
| 579 | void symbol_put_addr(void *addr); | 579 | void symbol_put_addr(void *addr); |
| 580 | 580 | ||
| 581 | /* Sometimes we know we already have a refcount, and it's easier not | 581 | /* Sometimes we know we already have a refcount, and it's easier not |
