diff options
| author | Len Brown <len.brown@intel.com> | 2007-08-12 00:21:08 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-08-12 00:21:08 -0400 |
| commit | 27196c30db1ed4ab09c2071149b3324a1a53cfb9 (patch) | |
| tree | 8d88ad2615b7b55cb7e0ebfc5fa15d992062d09a /drivers/acpi | |
| parent | ad17b209dca860a570e4ca75312c9f4d32672402 (diff) | |
| parent | 501092929ccb8a1d2eb0ed700e38df4ae0de7108 (diff) | |
| download | op-kernel-dev-27196c30db1ed4ab09c2071149b3324a1a53cfb9.zip op-kernel-dev-27196c30db1ed4ab09c2071149b3324a1a53cfb9.tar.gz | |
Pull processor into release branch
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 14 | ||||
| -rw-r--r-- | drivers/acpi/processor_perflib.c | 6 |
2 files changed, 13 insertions, 7 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index a898991..a8634a0 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, } if (pr->flags.bm_check) { - /* bus mastering control is necessary */ if (!pr->flags.bm_control) { - /* In this case we enter C3 without bus mastering */ - ACPI_DEBUG_PRINT((ACPI_DB_INFO, - "C3 support without bus mastering control\n")); + if (pr->flags.has_cst != 1) { + /* bus mastering control is necessary */ + ACPI_DEBUG_PRINT((ACPI_DB_INFO, + "C3 support requires BM control\n")); + return; + } else { + /* Here we enter C3 without bus mastering */ + ACPI_DEBUG_PRINT((ACPI_DB_INFO, + "C3 support without BM control\n")); + } } } else { /* diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index c4efc0c..463b024 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c @@ -539,7 +539,7 @@ end: } int acpi_processor_preregister_performance( - struct acpi_processor_performance **performance) + struct acpi_processor_performance *performance) { int count, count_target; int retval = 0; @@ -567,12 +567,12 @@ int acpi_processor_preregister_performance( continue; } - if (!performance || !performance[i]) { + if (!performance || !percpu_ptr(performance, i)) { retval = -EINVAL; continue; } - pr->performance = performance[i]; + pr->performance = percpu_ptr(performance, i); cpu_set(i, pr->performance->shared_cpu_map); if (acpi_processor_get_psd(pr)) { retval = -EINVAL; |
