Merge branch 'pm-cpufreq'

* pm-cpufreq: (37 commits)
  cpufreq: dt: allow driver to boot automatically
  intel_pstate: Fix overflow in busy_scaled due to long delay
  cpufreq: qoriq: optimize the CPU frequency switching time
  cpufreq: gx-suspmod: Fix two typos in two comments
  cpufreq: nforce2: Fix typo in comment to function nforce2_init()
  cpufreq: governor: Serialize governor callbacks
  cpufreq: governor: split cpufreq_governor_dbs()
  cpufreq: governor: register notifier from cs_init()
  cpufreq: Remove cpufreq_update_policy()
  cpufreq: Restart governor as soon as possible
  cpufreq: Call cpufreq_policy_put_kobj() from cpufreq_policy_free()
  cpufreq: Initialize policy->kobj while allocating policy
  cpufreq: Stop migrating sysfs files on hotplug
  cpufreq: Don't allow updating inactive policies from sysfs
  intel_pstate: Force setting target pstate when required
  intel_pstate: change some inconsistent debug information
  cpufreq: Track cpu managing sysfs kobjects separately
  cpufreq: Fix for typos in two comments
  cpufreq: Mark policy->governor = NULL for inactive policies
  cpufreq: Manage governor usage history with 'policy->last_governor'
  ...

1 files changed, 17 insertions, 8 deletions

diff --git a/include/trace/events/power.h b/include/trace/events/power.h
index d19840b0cac8..630d1e5e4de0 100644
--- a/include/trace/events/power.h
+++ b/include/trace/events/power.h
@@ -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
                 )