diff options
| author | Joerg Roedel <jroedel@suse.de> | 2015-01-26 07:42:49 -0500 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-01-26 07:42:49 -0500 |
| commit | fd47b693c3c694da8210b5a0c01b1e379f4d9865 (patch) | |
| tree | 84d8c5596df7f6eb295ac380b8ddb983af6c906d /include/linux/module.h | |
| parent | 89aa57d15f1833323b001c3764141311ac6179a2 (diff) | |
| parent | 16753322983bcca0eca6d81f20d23277df0d6cf7 (diff) | |
Merge branch 'arm/smmu' into arm/renesas
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index ebfb0e153c6a..b653d7c0a05a 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
| @@ -444,7 +444,7 @@ extern void __module_put_and_exit(struct module *mod, long code) | |||
| 444 | #define module_put_and_exit(code) __module_put_and_exit(THIS_MODULE, code) | 444 | #define module_put_and_exit(code) __module_put_and_exit(THIS_MODULE, code) |
| 445 | 445 | ||
| 446 | #ifdef CONFIG_MODULE_UNLOAD | 446 | #ifdef CONFIG_MODULE_UNLOAD |
| 447 | unsigned long module_refcount(struct module *mod); | 447 | int module_refcount(struct module *mod); |
| 448 | void __symbol_put(const char *symbol); | 448 | void __symbol_put(const char *symbol); |
| 449 | #define symbol_put(x) __symbol_put(VMLINUX_SYMBOL_STR(x)) | 449 | #define symbol_put(x) __symbol_put(VMLINUX_SYMBOL_STR(x)) |
| 450 | void symbol_put_addr(void *addr); | 450 | void symbol_put_addr(void *addr); |