diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-06-19 20:39:28 +0300 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-06-19 20:39:28 +0300 |
| commit | d4e0045c4ed300781d2d4cbab57d05ed5e665a37 (patch) | |
| tree | 925bab41d7906329392aa12c8fa7bcc70f64ca46 /include/linux/module.h | |
| parent | 2d7b56378d32b0cf006f8944cbba4046df45dd25 (diff) | |
| parent | 41f1830f5a7af77cf5c86359aba3cbd706687e52 (diff) | |
| download | linux-d4e0045c4ed300781d2d4cbab57d05ed5e665a37.tar.xz | |
Merge remote-tracking branch 'origin/master' into drm-misc-next-fixes
Backmerge 4.12-rc6 into -next-fixes. -next-fixes will contain find patches
for 4.13 merge window
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 0297c5cd7cdf..21f56393602f 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -493,6 +493,7 @@ static inline int module_is_live(struct module *mod) struct module *__module_text_address(unsigned long addr); struct module *__module_address(unsigned long addr); bool is_module_address(unsigned long addr); +bool __is_module_percpu_address(unsigned long addr, unsigned long *can_addr); bool is_module_percpu_address(unsigned long addr); bool is_module_text_address(unsigned long addr); @@ -582,7 +583,7 @@ extern bool try_module_get(struct module *module); extern void module_put(struct module *module); #else /*!CONFIG_MODULE_UNLOAD*/ -static inline int try_module_get(struct module *module) +static inline bool try_module_get(struct module *module) { return !module || module_is_live(module); } @@ -660,6 +661,11 @@ static inline bool is_module_percpu_address(unsigned long addr) return false; } +static inline bool __is_module_percpu_address(unsigned long addr, unsigned long *can_addr) +{ + return false; +} + static inline bool is_module_text_address(unsigned long addr) { return false; @@ -674,9 +680,9 @@ static inline void __module_get(struct module *module) { } -static inline int try_module_get(struct module *module) +static inline bool try_module_get(struct module *module) { - return 1; + return true; } static inline void module_put(struct module *module) |