diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-08 13:27:40 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-08 13:27:40 +0200 |
commit | 8c73c4d8319f38ec1a1fc630a88cbcb79cb1a8f6 (patch) | |
tree | 66bfc4406ddd5d6c4f4526b99536ee54f735d057 /drivers/cpuidle | |
parent | 48edb259863ffa1ab958ffe4eca39d7f1a02e0c0 (diff) | |
parent | 73df623addeaa6154b325b429a6c06eb6ad36004 (diff) | |
download | linux-stable-8c73c4d8319f38ec1a1fc630a88cbcb79cb1a8f6.tar.gz linux-stable-8c73c4d8319f38ec1a1fc630a88cbcb79cb1a8f6.tar.bz2 linux-stable-8c73c4d8319f38ec1a1fc630a88cbcb79cb1a8f6.zip |
Merge branch 'pm-cpuidle'
* pm-cpuidle:
cpuidle: sysfs: Export target residency information
intel_idle: fine-tune IVT residency targets
tools/power turbostat: Run on Broadwell
tools/power turbostat: simplify output, add Avg_MHz
intel_idle: Add CPU model 54 (Atom N2000 series)
intel_idle: support Bay Trail
intel_idle: allow sparse sub-state numbering, for Bay Trail
ACPI idle: permit sparse C-state sub-state numbers
Diffstat (limited to 'drivers/cpuidle')
-rw-r--r-- | drivers/cpuidle/sysfs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c index e918b6d0caf7..efe2f175168f 100644 --- a/drivers/cpuidle/sysfs.c +++ b/drivers/cpuidle/sysfs.c @@ -293,6 +293,7 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, \ } define_show_state_function(exit_latency) +define_show_state_function(target_residency) define_show_state_function(power_usage) define_show_state_ull_function(usage) define_show_state_ull_function(time) @@ -304,6 +305,7 @@ define_store_state_ull_function(disable) define_one_state_ro(name, show_state_name); define_one_state_ro(desc, show_state_desc); define_one_state_ro(latency, show_state_exit_latency); +define_one_state_ro(residency, show_state_target_residency); define_one_state_ro(power, show_state_power_usage); define_one_state_ro(usage, show_state_usage); define_one_state_ro(time, show_state_time); @@ -313,6 +315,7 @@ static struct attribute *cpuidle_state_default_attrs[] = { &attr_name.attr, &attr_desc.attr, &attr_latency.attr, + &attr_residency.attr, &attr_power.attr, &attr_usage.attr, &attr_time.attr, |