diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-13 02:12:41 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-13 02:12:41 +0100 |
| commit | 465e5fc41dbeeb5331bbff6e9e734f0542dfc739 (patch) | |
| tree | aeb7cc9a2ebc9858d0214ce555f8ffe12ea90adf /include | |
| parent | Merge branches 'acpi-dock', 'acpi-scan' and 'acpi-pci-hotplug' (diff) | |
| parent | MAINTAINERS / cpufreq: update Sudeep's email address (diff) | |
| download | linux-465e5fc41dbeeb5331bbff6e9e734f0542dfc739.tar.xz linux-465e5fc41dbeeb5331bbff6e9e734f0542dfc739.zip | |
Merge branch 'pm-cpufreq'
* pm-cpufreq:
MAINTAINERS / cpufreq: update Sudeep's email address
intel_pstate: Remove energy reporting from pstate_sample tracepoint
Diffstat (limited to 'include')
| -rw-r--r-- | include/trace/events/power.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/trace/events/power.h b/include/trace/events/power.h index 9e9475c85de5..e5bf9a76f169 100644 --- a/include/trace/events/power.h +++ b/include/trace/events/power.h @@ -42,7 +42,6 @@ TRACE_EVENT(pstate_sample, u32 state, u64 mperf, u64 aperf, - u32 energy, u32 freq ), @@ -51,7 +50,6 @@ TRACE_EVENT(pstate_sample, state, mperf, aperf, - energy, freq ), @@ -61,7 +59,6 @@ TRACE_EVENT(pstate_sample, __field(u32, state) __field(u64, mperf) __field(u64, aperf) - __field(u32, energy) __field(u32, freq) ), @@ -72,17 +69,15 @@ TRACE_EVENT(pstate_sample, __entry->state = state; __entry->mperf = mperf; __entry->aperf = aperf; - __entry->energy = energy; __entry->freq = freq; ), - TP_printk("core_busy=%lu scaled=%lu state=%lu mperf=%llu aperf=%llu energy=%lu freq=%lu ", + TP_printk("core_busy=%lu scaled=%lu state=%lu mperf=%llu aperf=%llu freq=%lu ", (unsigned long)__entry->core_busy, (unsigned long)__entry->scaled_busy, (unsigned long)__entry->state, (unsigned long long)__entry->mperf, (unsigned long long)__entry->aperf, - (unsigned long)__entry->energy, (unsigned long)__entry->freq ) |