diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-03-14 14:22:03 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-03-14 14:22:03 +0100 |
| commit | 4ed39004271280d2b5fc6929b2782c0e330f6895 (patch) | |
| tree | d0f3bc36dd0598bf6d9d7f7321992111f349bfb3 /kernel/trace | |
| parent | b5d5fad9bed079a4f182e4d282ca29380e8c08f2 (diff) | |
| parent | 4fec7ad5f637159525265a45f66482cf8817b45f (diff) | |
| download | linux-4ed39004271280d2b5fc6929b2782c0e330f6895.tar.bz2 | |
Merge branch 'pm-cpufreq'
* pm-cpufreq: (94 commits)
intel_pstate: Do not skip samples partially
intel_pstate: Remove freq calculation from intel_pstate_calc_busy()
intel_pstate: Move intel_pstate_calc_busy() into get_target_pstate_use_performance()
intel_pstate: Optimize calculation for max/min_perf_adj
intel_pstate: Remove extra conversions in pid calculation
cpufreq: Move scheduler-related code to the sched directory
Revert "cpufreq: postfix policy directory with the first CPU in related_cpus"
cpufreq: Reduce cpufreq_update_util() overhead a bit
cpufreq: Select IRQ_WORK if CPU_FREQ_GOV_COMMON is set
cpufreq: Remove 'policy->governor_enabled'
cpufreq: Rename __cpufreq_governor() to cpufreq_governor()
cpufreq: Relocate handle_update() to kill its declaration
cpufreq: governor: Drop unnecessary checks from show() and store()
cpufreq: governor: Fix race in dbs_update_util_handler()
cpufreq: governor: Make gov_set_update_util() static
cpufreq: governor: Narrow down the dbs_data_mutex coverage
cpufreq: governor: Make dbs_data_mutex static
cpufreq: governor: Relocate definitions of tuners structures
cpufreq: governor: Move per-CPU data to the common code
cpufreq: governor: Make governor private data per-policy
...
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/power-traces.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/power-traces.c b/kernel/trace/power-traces.c index eb4220a132ec..81b87451c0ea 100644 --- a/kernel/trace/power-traces.c +++ b/kernel/trace/power-traces.c @@ -15,4 +15,5 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(suspend_resume); EXPORT_TRACEPOINT_SYMBOL_GPL(cpu_idle); +EXPORT_TRACEPOINT_SYMBOL_GPL(powernv_throttle); |