Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ed3110efb538d7acbf635095c1382118f7414f75
Commit:     ed3110efb538d7acbf635095c1382118f7414f75
Parent:     d4ac2477fad0f2680e84ec12e387ce67682c5c13
Author:     Venki Pallipadi <[EMAIL PROTECTED]>
AuthorDate: Tue Jul 31 12:04:31 2007 -0700
Committer:  Len Brown <[EMAIL PROTECTED]>
CommitDate: Tue Aug 7 15:25:31 2007 -0400

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Len Brown <[EMAIL PROTECTED]>
---
 drivers/acpi/processor_idle.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 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 {
                /*
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to