diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-09-17 14:25:24 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-09-17 14:25:24 -0400 |
commit | 8592013bbd3858e9427ea2c5fb23a2c983b4dcaa (patch) | |
tree | a03aaef6ccc3f5bb42d7da2d37f7f81ef3854d95 /Documentation | |
parent | 00e8b2613331042bbe0177e5b9bb5c8a654b14ae (diff) | |
parent | ed1511b80c92b1b1a8dde567adc090e470a4344a (diff) |
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.txt | 10 |
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 | |||
76 | 76 | ||
77 | 77 | ||
78 | * desc : Small description about the idle state (string) | 78 | * desc : Small description about the idle state (string) |
79 | * disable : Option to disable this idle state (bool) | 79 | * disable : Option to disable this idle state (bool) -> see note below |
80 | * latency : Latency to exit out of this idle state (in microseconds) | 80 | * latency : Latency to exit out of this idle state (in microseconds) |
81 | * name : Name of the idle state (string) | 81 | * name : Name of the idle state (string) |
82 | * power : Power consumed while in this idle state (in milliwatts) | 82 | * power : Power consumed while in this idle state (in milliwatts) |
83 | * time : Total time spent in this idle state (in microseconds) | 83 | * time : Total time spent in this idle state (in microseconds) |
84 | * usage : Number of times this state was entered (count) | 84 | * usage : Number of times this state was entered (count) |
85 | |||
86 | Note: | ||
87 | The behavior and the effect of the disable variable depends on the | ||
88 | implementation of a particular governor. In the ladder governor, for | ||
89 | example, it is not coherent, i.e. if one is disabling a light state, | ||
90 | then all deeper states are disabled as well, but the disable variable | ||
91 | does not reflect it. Likewise, if one enables a deep state but a lighter | ||
92 | state still is disabled, then this has no effect. | ||