diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-29 01:11:24 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-29 01:11:24 -0500 |
| commit | 4fc31ba13d052c2933bf91095c063cf9a39effd0 (patch) | |
| tree | beabb73c2fe245e6541126732895da62e55bc8ee /include/linux/module.h | |
| parent | 0e18dd12064e07519f7cbff4149ca7fff620cbed (diff) | |
| parent | b29c6ef7bb1257853c1e31616d84f55e561cf631 (diff) | |
Merge branch 'linus' into perf/urgent, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index fe5aa3736707..c69b49abe877 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
| @@ -639,6 +639,8 @@ static inline bool is_livepatch_module(struct module *mod) | |||
| 639 | } | 639 | } |
| 640 | #endif /* CONFIG_LIVEPATCH */ | 640 | #endif /* CONFIG_LIVEPATCH */ |
| 641 | 641 | ||
| 642 | bool is_module_sig_enforced(void); | ||
| 643 | |||
| 642 | #else /* !CONFIG_MODULES... */ | 644 | #else /* !CONFIG_MODULES... */ |
| 643 | 645 | ||
| 644 | static inline struct module *__module_address(unsigned long addr) | 646 | static inline struct module *__module_address(unsigned long addr) |
| @@ -753,6 +755,11 @@ static inline bool module_requested_async_probing(struct module *module) | |||
| 753 | return false; | 755 | return false; |
| 754 | } | 756 | } |
| 755 | 757 | ||
| 758 | static inline bool is_module_sig_enforced(void) | ||
| 759 | { | ||
| 760 | return false; | ||
| 761 | } | ||
| 762 | |||
| 756 | #endif /* CONFIG_MODULES */ | 763 | #endif /* CONFIG_MODULES */ |
| 757 | 764 | ||
| 758 | #ifdef CONFIG_SYSFS | 765 | #ifdef CONFIG_SYSFS |
