aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-08-12 00:21:08 -0400
committerLen Brown <len.brown@intel.com>2007-08-12 00:21:08 -0400
commit27196c30db1ed4ab09c2071149b3324a1a53cfb9 (patch)
tree8d88ad2615b7b55cb7e0ebfc5fa15d992062d09a /drivers
parentad17b209dca860a570e4ca75312c9f4d32672402 (diff)
parent501092929ccb8a1d2eb0ed700e38df4ae0de7108 (diff)
Pull processor into release branch
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/processor_idle.c14
-rw-r--r--drivers/acpi/processor_perflib.c6
2 files changed, 13 insertions, 7 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index a898991f77cb..a8634a0655fc 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -969,11 +969,17 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
969 } 969 }
970 970
971 if (pr->flags.bm_check) { 971 if (pr->flags.bm_check) {
972 /* bus mastering control is necessary */
973 if (!pr->flags.bm_control) { 972 if (!pr->flags.bm_control) {
974 /* In this case we enter C3 without bus mastering */ 973 if (pr->flags.has_cst != 1) {
975 ACPI_DEBUG_PRINT((ACPI_DB_INFO, 974 /* bus mastering control is necessary */
976 "C3 support without bus mastering control\n")); 975 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
976 "C3 support requires BM control\n"));
977 return;
978 } else {
979 /* Here we enter C3 without bus mastering */
980 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
981 "C3 support without BM control\n"));
982 }
977 } 983 }
978 } else { 984 } else {
979 /* 985 /*
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index c4efc0c17f8f..463b0247cbc5 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -539,7 +539,7 @@ end:
539} 539}
540 540
541int acpi_processor_preregister_performance( 541int acpi_processor_preregister_performance(
542 struct acpi_processor_performance **performance) 542 struct acpi_processor_performance *performance)
543{ 543{
544 int count, count_target; 544 int count, count_target;
545 int retval = 0; 545 int retval = 0;
@@ -567,12 +567,12 @@ int acpi_processor_preregister_performance(
567 continue; 567 continue;
568 } 568 }
569 569
570 if (!performance || !performance[i]) { 570 if (!performance || !percpu_ptr(performance, i)) {
571 retval = -EINVAL; 571 retval = -EINVAL;
572 continue; 572 continue;
573 } 573 }
574 574
575 pr->performance = performance[i]; 575 pr->performance = percpu_ptr(performance, i);
576 cpu_set(i, pr->performance->shared_cpu_map); 576 cpu_set(i, pr->performance->shared_cpu_map);
577 if (acpi_processor_get_psd(pr)) { 577 if (acpi_processor_get_psd(pr)) {
578 retval = -EINVAL; 578 retval = -EINVAL;