trace_syscalls: Remove duplicate init_enter_##sname()

[safe/jmp/linux-2.6] / include / trace / power.h

diff --git a/include/trace/power.h b/include/trace/power.h
index c7cefbc..ef20466 100644 (file)
--- a/include/trace/power.h
+++ b/include/trace/power.h
@@ -2,6 +2,7 @@
 #define _TRACE_POWER_H
 
 #include <linux/ktime.h>
+#include <linux/tracepoint.h>
 
 enum {
        POWER_NONE = 0,
@@ -10,26 +11,22 @@ enum {
 };
 
 struct power_trace {
-#ifdef CONFIG_POWER_TRACER
        ktime_t                 stamp;
        ktime_t                 end;
        int                     type;
        int                     state;
-#endif
 };
 
-#ifdef CONFIG_POWER_TRACER
-extern void trace_power_start(struct power_trace *it, unsigned int type,
-                                       unsigned int state);
-extern void trace_power_mark(struct power_trace *it, unsigned int type,
-                                       unsigned int state);
-extern void trace_power_end(struct power_trace *it);
-#else
-static inline void trace_power_start(struct power_trace *it, unsigned int type,
-                                       unsigned int state) { }
-static inline void trace_power_mark(struct power_trace *it, unsigned int type,
-                                       unsigned int state) { }
-static inline void trace_power_end(struct power_trace *it) { }
-#endif
+DECLARE_TRACE(power_start,
+       TP_PROTO(struct power_trace *it, unsigned int type, unsigned int state),
+             TP_ARGS(it, type, state));
+
+DECLARE_TRACE(power_mark,
+       TP_PROTO(struct power_trace *it, unsigned int type, unsigned int state),
+             TP_ARGS(it, type, state));
+
+DECLARE_TRACE(power_end,
+       TP_PROTO(struct power_trace *it),
+             TP_ARGS(it));
 
 #endif /* _TRACE_POWER_H */