Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2004-02-13 11:38:37 -0500
committerLen Brown <len.brown@intel.com>2004-02-13 11:38:37 -0500
commit22a505623ec695bd9dadbe4d9c4043517a1548ce (patch)
tree5bcde161c78a629d965b9cefa3ca155734395d82
parent8a5429650cb2f8cc34ab4e69af9d9d45386fe72e (diff)
parent039d87834b3c8623841da374652fc114089568f3 (diff)
Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.2
into intel.com:/home/lenb/src/linux-acpi-test-2.6.3
-rw-r--r--drivers/acpi/processor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/processor.c b/drivers/acpi/processor.c
index 8bf340c1a557..a381161af6d4 100644
--- a/drivers/acpi/processor.c
+++ b/drivers/acpi/processor.c
@@ -1022,7 +1022,7 @@ acpi_processor_get_performance_states (
(u32) px->status));
if (!px->core_frequency) {
- ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "core_frequency is 0\n"));
+ ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSS data: freq is zero\n"));
result = -EFAULT;
kfree(pr->performance->states);
goto end;
@@ -1607,7 +1607,7 @@ static int cpu_has_cpufreq(unsigned int cpu)
static int acpi_thermal_cpufreq_increase(unsigned int cpu)
{
- if (!cpu_has_cpufreq)
+ if (!cpu_has_cpufreq(cpu))
return -ENODEV;
if (cpufreq_thermal_reduction_pctg[cpu] < 60) {
@@ -1622,7 +1622,7 @@ static int acpi_thermal_cpufreq_increase(unsigned int cpu)
static int acpi_thermal_cpufreq_decrease(unsigned int cpu)
{
- if (!cpu_has_cpufreq)
+ if (!cpu_has_cpufreq(cpu))
return -ENODEV;
if (cpufreq_thermal_reduction_pctg[cpu] >= 20) {