Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.2

into intel.com:/home/lenb/src/linux-acpi-test-2.6.3

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) {