From: Venki Pallipadi Date: Tue, 31 Jul 2007 19:04:31 +0000 (-0700) Subject: ACPI: fix "Time Problems with 2.6.23-rc1-gf695baf2" X-Git-Tag: v2.6.23-rc3~5^2~1^2~1 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed3110efb538d7acbf635095c1382118f7414f75;p=linux-2.6 ACPI: fix "Time Problems with 2.6.23-rc1-gf695baf2" Enable C3 without bm control only for CST based C3. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown --- diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index a898991f77..a8634a0655 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 { /*