summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-08 13:33:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-08 13:33:31 -0800
commit8defcaa6ba157f215c437939c3adcd1dbfa1a8fa (patch)
tree30da23f953a8de09dfc3f10fa216540a8b205b52 /Documentation
parent08c4f1b096cc2468908ea58a77d2ef92ef765c52 (diff)
parent1dbf58881f307e21a3df4b990a5bea401360d02e (diff)
downloadblackbird-op-linux-8defcaa6ba157f215c437939c3adcd1dbfa1a8fa.tar.gz
blackbird-op-linux-8defcaa6ba157f215c437939c3adcd1dbfa1a8fa.zip
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] Fix ondemand to not request targets outside policy limits [CPUFREQ] Fix use after free of struct powernow_k8_data [CPUFREQ] fix default value for ondemand governor
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/cpu-freq/governors.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/cpu-freq/governors.txt b/Documentation/cpu-freq/governors.txt
index aed082f49d09..737988fca64d 100644
--- a/Documentation/cpu-freq/governors.txt
+++ b/Documentation/cpu-freq/governors.txt
@@ -145,8 +145,8 @@ show_sampling_rate_max: THIS INTERFACE IS DEPRECATED, DON'T USE IT.
up_threshold: defines what the average CPU usage between the samplings
of 'sampling_rate' needs to be for the kernel to make a decision on
whether it should increase the frequency. For example when it is set
-to its default value of '80' it means that between the checking
-intervals the CPU needs to be on average more than 80% in use to then
+to its default value of '95' it means that between the checking
+intervals the CPU needs to be on average more than 95% in use to then
decide that the CPU frequency needs to be increased.
ignore_nice_load: this parameter takes a value of '0' or '1'. When
OpenPOWER on IntegriCloud