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] clarify license of freq_table.c [CPUFREQ] Remove documentation of removed ondemand tunable. [CPUFREQ] Crusoe: longrun cpufreq module reports false min freq [CPUFREQ] powernow-k8: improve error messages
This commit is contained in:
commit
e6b027a398
|
@ -129,14 +129,6 @@ 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
|
intervals the CPU needs to be on average more than 80% in use to then
|
||||||
decide that the CPU frequency needs to be increased.
|
decide that the CPU frequency needs to be increased.
|
||||||
|
|
||||||
sampling_down_factor: this parameter controls the rate that the CPU
|
|
||||||
makes a decision on when to decrease the frequency. When set to its
|
|
||||||
default value of '5' it means that at 1/5 the sampling_rate the kernel
|
|
||||||
makes a decision to lower the frequency. Five "lower rate" decisions
|
|
||||||
have to be made in a row before the CPU frequency is actually lower.
|
|
||||||
If set to '1' then the frequency decreases as quickly as it increases,
|
|
||||||
if set to '2' it decreases at half the rate of the increase.
|
|
||||||
|
|
||||||
ignore_nice_load: this parameter takes a value of '0' or '1'. When
|
ignore_nice_load: this parameter takes a value of '0' or '1'. When
|
||||||
set to '0' (its default), all processes are counted towards the
|
set to '0' (its default), all processes are counted towards the
|
||||||
'cpu utilisation' value. When set to '1', the processes that are
|
'cpu utilisation' value. When set to '1', the processes that are
|
||||||
|
|
|
@ -245,7 +245,7 @@ static unsigned int __init longrun_determine_freqs(unsigned int *low_freq,
|
||||||
if ((ecx > 95) || (ecx == 0) || (eax < ebx))
|
if ((ecx > 95) || (ecx == 0) || (eax < ebx))
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
|
||||||
edx = (eax - ebx) / (100 - ecx);
|
edx = ((eax - ebx) * 100) / (100 - ecx);
|
||||||
*low_freq = edx * 1000; /* back to kHz */
|
*low_freq = edx * 1000; /* back to kHz */
|
||||||
|
|
||||||
dprintk("low frequency is %u kHz\n", *low_freq);
|
dprintk("low frequency is %u kHz\n", *low_freq);
|
||||||
|
|
|
@ -1127,12 +1127,23 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
|
||||||
* an UP version, and is deprecated by AMD.
|
* an UP version, and is deprecated by AMD.
|
||||||
*/
|
*/
|
||||||
if (num_online_cpus() != 1) {
|
if (num_online_cpus() != 1) {
|
||||||
printk(KERN_ERR PFX "MP systems not supported by PSB BIOS structure\n");
|
#ifndef CONFIG_ACPI_PROCESSOR
|
||||||
|
printk(KERN_ERR PFX "ACPI Processor support is required "
|
||||||
|
"for SMP systems but is absent. Please load the "
|
||||||
|
"ACPI Processor module before starting this "
|
||||||
|
"driver.\n");
|
||||||
|
#else
|
||||||
|
printk(KERN_ERR PFX "Your BIOS does not provide ACPI "
|
||||||
|
"_PSS objects in a way that Linux understands. "
|
||||||
|
"Please report this to the Linux ACPI maintainers"
|
||||||
|
" and complain to your BIOS vendor.\n");
|
||||||
|
#endif
|
||||||
kfree(data);
|
kfree(data);
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
if (pol->cpu != 0) {
|
if (pol->cpu != 0) {
|
||||||
printk(KERN_ERR PFX "No _PSS objects for CPU other than CPU0\n");
|
printk(KERN_ERR PFX "No ACPI _PSS objects for CPU other than "
|
||||||
|
"CPU0. Complain to your BIOS vendor.\n");
|
||||||
kfree(data);
|
kfree(data);
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,11 @@
|
||||||
* linux/drivers/cpufreq/freq_table.c
|
* linux/drivers/cpufreq/freq_table.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2002 - 2003 Dominik Brodowski
|
* Copyright (C) 2002 - 2003 Dominik Brodowski
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
|
|
Loading…
Reference in New Issue