X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Frpm.h;h=2baebc8750947f8de2393ebb834430dfeffc4467;hb=3bc29f0a41b3c803245b845db2e1909042e72e9c;hp=16bcad02f3d3bd0b1add74df8f7ddbba9d604ff5;hpb=7ca580f8aca4f8c2b9e0066ad52ebfc226b3d645;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/rpm.h b/instrumentation/events/lttng-module/rpm.h
index 16bcad02..2baebc87 100644
--- a/instrumentation/events/lttng-module/rpm.h
+++ b/instrumentation/events/lttng-module/rpm.h
@@ -2,11 +2,11 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM rpm
 
-#if !defined(_TRACE_RUNTIME_POWER_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_RUNTIME_POWER_H
+#if !defined(LTTNG_TRACE_RUNTIME_POWER_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_RUNTIME_POWER_H
 
+#include "../../../probes/lttng-tracepoint-event.h"
 #include <linux/ktime.h>
-#include <linux/tracepoint.h>
 
 #ifndef _TRACE_RPM_DEF_
 #define _TRACE_RPM_DEF_
@@ -17,7 +17,7 @@ struct device;
  * The rpm_internal events are used for tracing some important
  * runtime pm internal functions.
  */
-DECLARE_EVENT_CLASS(rpm_internal,
+LTTNG_TRACEPOINT_EVENT_CLASS(rpm_internal,
 
 	TP_PROTO(struct device *dev, int flags),
 
@@ -56,26 +56,26 @@ DECLARE_EVENT_CLASS(rpm_internal,
 			__entry->child_count
 		 )
 )
-DEFINE_EVENT(rpm_internal, rpm_suspend,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpm_internal, rpm_suspend,
 
 	TP_PROTO(struct device *dev, int flags),
 
 	TP_ARGS(dev, flags)
 )
-DEFINE_EVENT(rpm_internal, rpm_resume,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpm_internal, rpm_resume,
 
 	TP_PROTO(struct device *dev, int flags),
 
 	TP_ARGS(dev, flags)
 )
-DEFINE_EVENT(rpm_internal, rpm_idle,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpm_internal, rpm_idle,
 
 	TP_PROTO(struct device *dev, int flags),
 
 	TP_ARGS(dev, flags)
 )
 
-TRACE_EVENT(rpm_return_int,
+LTTNG_TRACEPOINT_EVENT(rpm_return_int,
 	TP_PROTO(struct device *dev, unsigned long ip, int ret),
 	TP_ARGS(dev, ip, ret),
 
@@ -95,7 +95,7 @@ TRACE_EVENT(rpm_return_int,
 		__entry->ret)
 )
 
-#endif /* _TRACE_RUNTIME_POWER_H */
+#endif /* LTTNG_TRACE_RUNTIME_POWER_H */
 
 /* This part must be outside protection */
 #include "../../../probes/define_trace.h"