tracing: Replace trace_event struct array with pointer array

[mirror_ubuntu-zesty-kernel.git] / include / linux / module.h

diff --git a/include/linux/module.h b/include/linux/module.h
index 50efcd3ae8507fcbbbff6e361491f7f60c00a5ca..7695a303bb554e0840c8bf05563cb01beeb601a7 100644 (file)
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -168,7 +168,7 @@ extern struct module __this_module;
   local headers in "srcversion".
 */
 
-#ifdef MODULE
+#if defined(MODULE) || !defined(CONFIG_SYSFS)
 #define MODULE_VERSION(_version) MODULE_INFO(version, _version)
 #else
 #define MODULE_VERSION(_version)                                       \
@@ -389,7 +389,7 @@ struct module
        unsigned int num_trace_bprintk_fmt;
 #endif
 #ifdef CONFIG_EVENT_TRACING
-       struct ftrace_event_call *trace_events;
+       struct ftrace_event_call **trace_events;
        unsigned int num_trace_events;
 #endif
 #ifdef CONFIG_FTRACE_MCOUNT_RECORD