Part of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes. Signed-off-by: Mathieu Desnoyers CC: Steven Rostedt CC: Frederic Weisbecker CC: Ingo Molnar CC: Thomas Gleixner CC: Li Zefan CC: Rusty Russell --- include/trace/events/module.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) Index: linux-2.6-lttng/include/trace/events/module.h =================================================================== --- linux-2.6-lttng.orig/include/trace/events/module.h +++ linux-2.6-lttng/include/trace/events/module.h @@ -8,6 +8,9 @@ #ifdef CONFIG_MODULES +#ifndef _TRACE_MODULE_DEF_ +#define _TRACE_MODULE_DEF_ + struct module; #define show_module_flags(flags) __print_flags(flags, "", \ @@ -15,6 +18,8 @@ struct module; { (1UL << TAINT_FORCED_MODULE), "F" }, \ { (1UL << TAINT_CRAP), "C" }) +#endif /* _TRACE_MODULE_DEF_ */ + TRACE_EVENT(module_load, TP_PROTO(struct module *mod), @@ -32,7 +37,7 @@ TRACE_EVENT(module_load, ), TP_printk("%s %s", __get_str(name), show_module_flags(__entry->taints)) -); +) TRACE_EVENT(module_free, @@ -49,7 +54,7 @@ TRACE_EVENT(module_free, ), TP_printk("%s", __get_str(name)) -); +) #ifdef CONFIG_MODULE_UNLOAD /* trace_module_get/put are only used if CONFIG_MODULE_UNLOAD is defined */ @@ -74,21 +79,21 @@ DECLARE_EVENT_CLASS(module_refcnt, TP_printk("%s call_site=%pf refcnt=%d", __get_str(name), (void *)__entry->ip, __entry->refcnt) -); +) DEFINE_EVENT(module_refcnt, module_get, TP_PROTO(struct module *mod, unsigned long ip), TP_ARGS(mod, ip) -); +) DEFINE_EVENT(module_refcnt, module_put, TP_PROTO(struct module *mod, unsigned long ip), TP_ARGS(mod, ip) -); +) #endif /* CONFIG_MODULE_UNLOAD */ TRACE_EVENT(module_request, @@ -111,7 +116,7 @@ TRACE_EVENT(module_request, TP_printk("%s wait=%d call_site=%pf", __get_str(name), (int)__entry->wait, (void *)__entry->ip) -); +) #endif /* CONFIG_MODULES */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/