summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-09-17 20:25:24 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2012-09-17 20:25:24 +0200
commit8592013bbd3858e9427ea2c5fb23a2c983b4dcaa (patch)
treea03aaef6ccc3f5bb42d7da2d37f7f81ef3854d95 /Documentation
parent00e8b2613331042bbe0177e5b9bb5c8a654b14ae (diff)
parented1511b80c92b1b1a8dde567adc090e470a4344a (diff)
downloadlinux-stable-8592013bbd3858e9427ea2c5fb23a2c983b4dcaa.tar.gz
linux-stable-8592013bbd3858e9427ea2c5fb23a2c983b4dcaa.tar.bz2
linux-stable-8592013bbd3858e9427ea2c5fb23a2c983b4dcaa.zip
Merge branch 'pm-cpuidle'
* pm-cpuidle: ACPI / processor: remove pointless variable initialization ACPI / processor: remove unused function parameter cpuidle / ACPI : remove power from acpi_processor_cx structure PM / cpuidle: Make ladder governor use the "disabled" state flag Honor state disabling in the cpuidle ladder governor
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/cpuidle/sysfs.txt10
1 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/cpuidle/sysfs.txt b/Documentation/cpuidle/sysfs.txt
index 9d28a3406e74..b6f44f490ed7 100644
--- a/Documentation/cpuidle/sysfs.txt
+++ b/Documentation/cpuidle/sysfs.txt
@@ -76,9 +76,17 @@ total 0
* desc : Small description about the idle state (string)
-* disable : Option to disable this idle state (bool)
+* disable : Option to disable this idle state (bool) -> see note below
* latency : Latency to exit out of this idle state (in microseconds)
* name : Name of the idle state (string)
* power : Power consumed while in this idle state (in milliwatts)
* time : Total time spent in this idle state (in microseconds)
* usage : Number of times this state was entered (count)
+
+Note:
+The behavior and the effect of the disable variable depends on the
+implementation of a particular governor. In the ladder governor, for
+example, it is not coherent, i.e. if one is disabling a light state,
+then all deeper states are disabled as well, but the disable variable
+does not reflect it. Likewise, if one enables a deep state but a lighter
+state still is disabled, then this has no effect.