From 3b0d24cf51a6e4ffbf6589da2a5f541ba134358c Mon Sep 17 00:00:00 2001 From: Len Brown Date: Thu, 4 Oct 2007 01:23:47 -0400 Subject: [PATCH] --- yaml --- r: 71649 b: refs/heads/master c: e196441bdf2dbf0526b28a6829c39557c236d611 h: refs/heads/master i: 71647: df8799facd02f2135bce3e409d545362ffe0064b v: v3 --- [refs] | 2 +- trunk/drivers/acpi/processor_idle.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f73b119ce251..f06e883d17e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f86d3a8e297205780cca027e974fd5f81064780 +refs/heads/master: e196441bdf2dbf0526b28a6829c39557c236d611 diff --git a/trunk/drivers/acpi/processor_idle.c b/trunk/drivers/acpi/processor_idle.c index 99da6a790857..0cad56ca342b 100644 --- a/trunk/drivers/acpi/processor_idle.c +++ b/trunk/drivers/acpi/processor_idle.c @@ -1416,6 +1416,9 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev, if (unlikely(!pr)) return 0; + if (acpi_idle_suspend) + return(acpi_idle_enter_c1(dev, state)); + if (pr->flags.bm_check) acpi_idle_update_bm_rld(pr, cx); @@ -1477,6 +1480,9 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, if (unlikely(!pr)) return 0; + if (acpi_idle_suspend) + return(acpi_idle_enter_c1(dev, state)); + local_irq_disable(); current_thread_info()->status &= ~TS_POLLING; /*