Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / include / linux / module.h

diff --git a/include/linux/module.h b/include/linux/module.h
index 46efa1c9de60b45657f9e51d1d910ea533262052..d67b1932cc59869cd5c3dc5d24efa5994b368386 100644 (file)
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -268,6 +268,8 @@ struct module {
        bool sig_ok;
 #endif
 
+       bool async_probe_requested;
+
        /* symbols that will be GPL-only in the near future. */
        const struct kernel_symbol *gpl_future_syms;
        const unsigned long *gpl_future_crcs;
@@ -364,7 +366,7 @@ struct module {
        const char **trace_bprintk_fmt_start;
 #endif
 #ifdef CONFIG_EVENT_TRACING
-       struct ftrace_event_call **trace_events;
+       struct trace_event_call **trace_events;
        unsigned int num_trace_events;
        struct trace_enum_map **trace_enums;
        unsigned int num_trace_enums;
@@ -544,6 +546,11 @@ int unregister_module_notifier(struct notifier_block *nb);
 
 extern void print_modules(void);
 
+static inline bool module_requested_async_probing(struct module *module)
+{
+       return module && module->async_probe_requested;
+}
+
 #else /* !CONFIG_MODULES... */
 
 /* Given an address, look for it in the exception tables. */
@@ -654,6 +661,12 @@ static inline int unregister_module_notifier(struct notifier_block *nb)
 static inline void print_modules(void)
 {
 }
+
+static inline bool module_requested_async_probing(struct module *module)
+{
+       return false;
+}
+
 #endif /* CONFIG_MODULES */
 
 #ifdef CONFIG_SYSFS
@@ -691,4 +704,16 @@ static inline void module_bug_finalize(const Elf_Ehdr *hdr,
 static inline void module_bug_cleanup(struct module *mod) {}
 #endif /* CONFIG_GENERIC_BUG */
 
+#ifdef CONFIG_MODULE_SIG
+static inline bool module_sig_ok(struct module *module)
+{
+       return module->sig_ok;
+}
+#else  /* !CONFIG_MODULE_SIG */
+static inline bool module_sig_ok(struct module *module)
+{
+       return true;
+}
+#endif /* CONFIG_MODULE_SIG */
+
 #endif /* _LINUX_MODULE_H */