summaryrefslogtreecommitdiff
path: root/include/linux/module.h
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.com>2017-12-04 21:04:45 +0300
committerGustavo Padovan <gustavo.padovan@collabora.com>2017-12-04 21:04:45 +0300
commit7b47c66cfa203288c43851260edeeb0fae56f692 (patch)
treefa729735fdaf1d77fbbf13062fd53c31b59d682d /include/linux/module.h
parentca0e68e21aae10220eff71a297e7d794425add77 (diff)
parentca797d29cd63e7b71b4eea29aff3b1cefd1ecb59 (diff)
downloadlinux-7b47c66cfa203288c43851260edeeb0fae56f692.tar.xz
Merge arlied/drm-next into drm-misc-next
We need to pull 66660d4cf21b (drm: add connector info/property for non-desktop displays [v2]) into drm-misc-next to continue the development of the display rotation series. Effectively this also pulls 4.15-r2 into drm-misc-next. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Diffstat (limited to 'include/linux/module.h')
-rw-r--r--include/linux/module.h7
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)
}
#endif /* CONFIG_LIVEPATCH */
+bool is_module_sig_enforced(void);
+
#else /* !CONFIG_MODULES... */
static inline struct module *__module_address(unsigned long addr)
@@ -753,6 +755,11 @@ static inline bool module_requested_async_probing(struct module *module)
return false;
}
+static inline bool is_module_sig_enforced(void)
+{
+ return false;
+}
+
#endif /* CONFIG_MODULES */
#ifdef CONFIG_SYSFS