These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / trace / events / power.h

diff --git a/kernel/include/trace/events/power.h b/kernel/include/trace/events/power.h
index d19840b..284244e 100644 (file)
--- a/kernel/include/trace/events/power.h
+++ b/kernel/include/trace/events/power.h
@@ -7,7 +7,7 @@
 #include <linux/ktime.h>
 #include <linux/pm_qos.h>
 #include <linux/tracepoint.h>
-#include <linux/ftrace_event.h>
+#include <linux/trace_events.h>
 
 #define TPS(x)  tracepoint_string(x)
 
@@ -42,45 +42,54 @@ TRACE_EVENT(pstate_sample,
 
        TP_PROTO(u32 core_busy,
                u32 scaled_busy,
-               u32 state,
+               u32 from,
+               u32 to,
                u64 mperf,
                u64 aperf,
+               u64 tsc,
                u32 freq
                ),
 
        TP_ARGS(core_busy,
                scaled_busy,
-               state,
+               from,
+               to,
                mperf,
                aperf,
+               tsc,
                freq
                ),
 
        TP_STRUCT__entry(
                __field(u32, core_busy)
                __field(u32, scaled_busy)
-               __field(u32, state)
+               __field(u32, from)
+               __field(u32, to)
                __field(u64, mperf)
                __field(u64, aperf)
+               __field(u64, tsc)
                __field(u32, freq)
-
-       ),
+               ),
 
        TP_fast_assign(
                __entry->core_busy = core_busy;
                __entry->scaled_busy = scaled_busy;
-               __entry->state = state;
+               __entry->from = from;
+               __entry->to = to;
                __entry->mperf = mperf;
                __entry->aperf = aperf;
+               __entry->tsc = tsc;
                __entry->freq = freq;
                ),
 
-       TP_printk("core_busy=%lu scaled=%lu state=%lu mperf=%llu aperf=%llu freq=%lu ",
+       TP_printk("core_busy=%lu scaled=%lu from=%lu to=%lu mperf=%llu aperf=%llu tsc=%llu freq=%lu ",
                (unsigned long)__entry->core_busy,
                (unsigned long)__entry->scaled_busy,
-               (unsigned long)__entry->state,
+               (unsigned long)__entry->from,
+               (unsigned long)__entry->to,
                (unsigned long long)__entry->mperf,
                (unsigned long long)__entry->aperf,
+               (unsigned long long)__entry->tsc,
                (unsigned long)__entry->freq
                )