summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-10-18 12:26:11 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-10-18 12:26:11 +0200
commitd1551f7a5aed809bb1e912da9faf36927e739ca0 (patch)
tree742c7c347173f501c401f74d731f513f9a5533dc /include
parentMerge branch 'pm-cpuidle' (diff)
parentcpufreq: tegra186: don't pass GFP_DMA32 to dma_alloc_coherent() (diff)
downloadlinux-d1551f7a5aed809bb1e912da9faf36927e739ca0.tar.xz
linux-d1551f7a5aed809bb1e912da9faf36927e739ca0.zip
Merge branch 'pm-cpufreq'
* pm-cpufreq: cpufreq: tegra186: don't pass GFP_DMA32 to dma_alloc_coherent() cpufreq: conservative: Take limits changes into account properly Documentation: intel_pstate: Add base_frequency information cpufreq: intel_pstate: Add base_frequency attribute ACPI / CPPC: Add support for guaranteed performance cpufreq: imx6q: read OCOTP through nvmem for imx6ul/imx6ull cpufreq: dt-platdev: allow RK3399 to have separate tunables per cluster cpufreq / CPPC: Mark acpi_ids as used cpufreq: dt: Add support for r8a7744 cpufreq: Convert to using %pOFn instead of device_node.name cpufreq: remove unnecessary unlikely()
Diffstat (limited to 'include')
-rw-r--r--include/acpi/cppc_acpi.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/cppc_acpi.h b/include/acpi/cppc_acpi.h
index 8e0b8250a139..cf59e6210d27 100644
--- a/include/acpi/cppc_acpi.h
+++ b/include/acpi/cppc_acpi.h
@@ -104,6 +104,7 @@ enum cppc_regs {
* today.
*/
struct cppc_perf_caps {
+ u32 guaranteed_perf;
u32 highest_perf;
u32 nominal_perf;
u32 lowest_perf;