From: Thomas Renninger <trenn@suse.de>
Date: Tue, 27 Jun 2006 04:06:37 +0000 (-0400)
Subject: Pull bugzilla-5737 into release branch
X-Git-Tag: v2.6.18-rc1~257^2~16
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=d7fa2589bbe7ab53fd5eb20e8c7e388d5aff6f16;hp=-c

Pull bugzilla-5737 into release branch
---

d7fa2589bbe7ab53fd5eb20e8c7e388d5aff6f16
diff --combined drivers/acpi/processor_perflib.c
index 8bd7500c6121,299fbbb07e0e..5c24ac45717c
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@@ -123,7 -123,7 +123,7 @@@ static int acpi_processor_get_platform_
  		acpi_processor_ppc_status |= PPC_IN_USE;
  
  	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
 -		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _PPC\n"));
 +		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PPC"));
  		return_VALUE(-ENODEV);
  	}
  
@@@ -172,14 -172,14 +172,14 @@@ static int acpi_processor_get_performan
  
  	status = acpi_evaluate_object(pr->handle, "_PCT", NULL, &buffer);
  	if (ACPI_FAILURE(status)) {
 -		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _PCT\n"));
 +		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PCT"));
  		return_VALUE(-ENODEV);
  	}
  
  	pct = (union acpi_object *)buffer.pointer;
  	if (!pct || (pct->type != ACPI_TYPE_PACKAGE)
  	    || (pct->package.count != 2)) {
 -		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PCT data\n"));
 +		printk(KERN_ERR PREFIX "Invalid _PCT data\n");
  		result = -EFAULT;
  		goto end;
  	}
@@@ -193,7 -193,8 +193,7 @@@
  	if ((obj.type != ACPI_TYPE_BUFFER)
  	    || (obj.buffer.length < sizeof(struct acpi_pct_register))
  	    || (obj.buffer.pointer == NULL)) {
 -		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
 -				  "Invalid _PCT data (control_register)\n"));
 +		printk(KERN_ERR PREFIX "Invalid _PCT data (control_register)\n");
  		result = -EFAULT;
  		goto end;
  	}
@@@ -209,7 -210,8 +209,7 @@@
  	if ((obj.type != ACPI_TYPE_BUFFER)
  	    || (obj.buffer.length < sizeof(struct acpi_pct_register))
  	    || (obj.buffer.pointer == NULL)) {
 -		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
 -				  "Invalid _PCT data (status_register)\n"));
 +		printk(KERN_ERR PREFIX "Invalid _PCT data (status_register)\n");
  		result = -EFAULT;
  		goto end;
  	}
@@@ -237,13 -239,13 +237,13 @@@ static int acpi_processor_get_performan
  
  	status = acpi_evaluate_object(pr->handle, "_PSS", NULL, &buffer);
  	if (ACPI_FAILURE(status)) {
 -		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _PSS\n"));
 +		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PSS"));
  		return_VALUE(-ENODEV);
  	}
  
  	pss = (union acpi_object *)buffer.pointer;
  	if (!pss || (pss->type != ACPI_TYPE_PACKAGE)) {
 -		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSS data\n"));
 +		printk(KERN_ERR PREFIX "Invalid _PSS data\n");
  		result = -EFAULT;
  		goto end;
  	}
@@@ -272,7 -274,8 +272,7 @@@
  		status = acpi_extract_package(&(pss->package.elements[i]),
  					      &format, &state);
  		if (ACPI_FAILURE(status)) {
 -			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
 -					  "Invalid _PSS data\n"));
 +			ACPI_EXCEPTION((AE_INFO, status, "Invalid _PSS data"));
  			result = -EFAULT;
  			kfree(pr->performance->states);
  			goto end;
@@@ -288,8 -291,8 +288,8 @@@
  				  (u32) px->control, (u32) px->status));
  
  		if (!px->core_frequency) {
 -			ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
 -					  "Invalid _PSS data: freq is zero\n"));
 +			printk(KERN_ERR PREFIX
 +				    "Invalid _PSS data: freq is zero\n");
  			result = -EFAULT;
  			kfree(pr->performance->states);
  			goto end;
@@@ -384,10 -387,10 +384,10 @@@ int acpi_processor_notify_smm(struct mo
  	status = acpi_os_write_port(acpi_fadt.smi_cmd,
  				    (u32) acpi_fadt.pstate_cnt, 8);
  	if (ACPI_FAILURE(status)) {
 -		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
 -				  "Failed to write pstate_cnt [0x%x] to "
 -				  "smi_cmd [0x%x]\n", acpi_fadt.pstate_cnt,
 -				  acpi_fadt.smi_cmd));
 +		ACPI_EXCEPTION((AE_INFO, status,
 +				"Failed to write pstate_cnt [0x%x] to "
 +				"smi_cmd [0x%x]", acpi_fadt.pstate_cnt,
 +				acpi_fadt.smi_cmd));
  		module_put(calling_module);
  		return_VALUE(status);
  	}
@@@ -511,7 -514,11 +511,7 @@@ static void acpi_cpufreq_add_file(struc
  	entry = create_proc_entry(ACPI_PROCESSOR_FILE_PERFORMANCE,
  				  S_IFREG | S_IRUGO | S_IWUSR,
  				  acpi_device_dir(device));
 -	if (!entry)
 -		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
 -				  "Unable to create '%s' fs entry\n",
 -				  ACPI_PROCESSOR_FILE_PERFORMANCE));
 -	else {
 +	if (entry){
  		acpi_processor_perf_fops.write = acpi_processor_write_performance;
  		entry->proc_fops = &acpi_processor_perf_fops;
  		entry->data = acpi_driver_data(device);
@@@ -691,12 -698,12 +691,12 @@@ int acpi_processor_preregister_performa
  		/* Validate the Domain info */
  		count_target = pdomain->num_processors;
  		count = 1;
- 		if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ALL ||
- 		    pdomain->coord_type == DOMAIN_COORD_TYPE_HW_ALL) {
+ 		if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ALL)
  			pr->performance->shared_type = CPUFREQ_SHARED_TYPE_ALL;
- 		} else if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ANY) {
+ 		else if (pdomain->coord_type == DOMAIN_COORD_TYPE_HW_ALL)
+ 			pr->performance->shared_type = CPUFREQ_SHARED_TYPE_HW;
+ 		else if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ANY)
  			pr->performance->shared_type = CPUFREQ_SHARED_TYPE_ANY;
- 		}
  
  		for_each_possible_cpu(j) {
  			if (i == j)