mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 13:44:26 -04:00
Merge branch 'pm-cpufreq'
* pm-cpufreq: MAINTAINERS / cpufreq: update Sudeep's email address intel_pstate: Remove energy reporting from pstate_sample tracepoint
This commit is contained in:
commit
465e5fc41d
3 changed files with 2 additions and 16 deletions
|
|
@ -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
|
||||
)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue