diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
| commit | f11cbd74c5ff3614f6390b4de67a6ffdc614c378 (patch) | |
| tree | 6a30920ade9eeaac5bf6d6263b5d09712e882eb0 /Documentation/cpu-freq/governors.txt | |
| parent | 429c42c9d246f5bda868495c09974312a0177328 (diff) | |
| parent | aea187c46f7d03ce985e55eb1398d0776a15b928 (diff) | |
Merge branch 'master' into for-2.6.34
Diffstat (limited to 'Documentation/cpu-freq/governors.txt')
| -rw-r--r-- | Documentation/cpu-freq/governors.txt | 4 |
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. | |||
| 145 | up_threshold: defines what the average CPU usage between the samplings | 145 | up_threshold: defines what the average CPU usage between the samplings |
| 146 | of 'sampling_rate' needs to be for the kernel to make a decision on | 146 | of 'sampling_rate' needs to be for the kernel to make a decision on |
| 147 | whether it should increase the frequency. For example when it is set | 147 | whether it should increase the frequency. For example when it is set |
| 148 | to its default value of '80' it means that between the checking | 148 | to its default value of '95' it means that between the checking |
| 149 | intervals the CPU needs to be on average more than 80% in use to then | 149 | intervals the CPU needs to be on average more than 95% in use to then |
| 150 | decide that the CPU frequency needs to be increased. | 150 | decide that the CPU frequency needs to be increased. |
| 151 | 151 | ||
| 152 | ignore_nice_load: this parameter takes a value of '0' or '1'. When | 152 | ignore_nice_load: this parameter takes a value of '0' or '1'. When |