summaryrefslogtreecommitdiffstats
path: root/include/acpi/cppc_acpi.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-06-27 22:26:44 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-06-27 22:26:44 +0200
commita976c2951d8f376112361830aa7762beff83a205 (patch)
tree24f6647aedd4b570cb67f3195962f5c8a040c824 /include/acpi/cppc_acpi.h
parent83848fbe7e6af978c080a88c130a67178b1ac0e4 (diff)
parent16b9951f656ea8f2b47546bd898325a7e256932f (diff)
downloadtalos-obmc-linux-a976c2951d8f376112361830aa7762beff83a205.tar.gz
talos-obmc-linux-a976c2951d8f376112361830aa7762beff83a205.zip
Merge back ACPICA material for v4.13.
Diffstat (limited to 'include/acpi/cppc_acpi.h')
-rw-r--r--include/acpi/cppc_acpi.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/acpi/cppc_acpi.h b/include/acpi/cppc_acpi.h
index 427a7c3e6c75..2010c0516f27 100644
--- a/include/acpi/cppc_acpi.h
+++ b/include/acpi/cppc_acpi.h
@@ -103,6 +103,7 @@ struct cppc_perf_caps {
u32 highest_perf;
u32 nominal_perf;
u32 lowest_perf;
+ u32 lowest_nonlinear_perf;
};
struct cppc_perf_ctrls {
@@ -115,7 +116,7 @@ struct cppc_perf_fb_ctrs {
u64 reference;
u64 delivered;
u64 reference_perf;
- u64 ctr_wrap_time;
+ u64 wraparound_time;
};
/* Per CPU container for runtime CPPC management. */
OpenPOWER on IntegriCloud