diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-07-20 17:45:04 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-07-20 17:45:04 -0700 |
| commit | ca8122f7b3af3c2e490f080f4213c593ab6dc245 (patch) | |
| tree | ce413dcb8460b19b2a0f2ede31d3b76ba22f1c36 /Documentation/cpu-freq | |
| parent | 386d90bdfaceb2b08812ff3199e38f25f5aeef90 (diff) | |
| parent | 07b02fbd98dcc988eb3379b916832473bd8bdfc1 (diff) | |
| download | kernel_samsung_tuna-ca8122f7b3af3c2e490f080f4213c593ab6dc245.zip kernel_samsung_tuna-ca8122f7b3af3c2e490f080f4213c593ab6dc245.tar.gz kernel_samsung_tuna-ca8122f7b3af3c2e490f080f4213c593ab6dc245.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
Conflicts:
Documentation/cpu-freq/governors.txt
Diffstat (limited to 'Documentation/cpu-freq')
| -rw-r--r-- | Documentation/cpu-freq/governors.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/cpu-freq/governors.txt b/Documentation/cpu-freq/governors.txt index e1083b0..46abbcb 100644 --- a/Documentation/cpu-freq/governors.txt +++ b/Documentation/cpu-freq/governors.txt @@ -215,10 +215,10 @@ to MAX speed. If the cpu was not sufficiently busy to immediately ramp to MAX speed, then governor evaluates the cpu load since the last speed adjustment, -choosing th highest value between that longer-term load or the +choosing the highest value between that longer-term load or the short-term load since idle exit to determine the cpu speed to ramp to. -The tuneable value for this governor are: +The tuneable values for this governor are: min_sample_time: The minimum amount of time to spend at the current frequency before ramping down. This is to ensure that the governor has @@ -228,6 +228,9 @@ workload. Default is 80000 uS. go_maxspeed_load: The CPU load at which to ramp to max speed. Default is 85. +timer_rate: Sample rate for reevaluating cpu load when the system is +not idle. Default is 30000 uS. + 2.7 Hotplug ----------- |