Subject: ACPI: use the saved pm_idle function in course of suspend/resume From: Zhao Yakui Use the saved pm_idle function to enter the C-state in course of suspend/resume Signed-off-by: --- drivers/acpi/processor_idle.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) Index: linux-2.6/drivers/acpi/processor_idle.c =================================================================== --- linux-2.6.orig/drivers/acpi/processor_idle.c 2009-02-24 14:09:39.000000000 +0800 +++ linux-2.6/drivers/acpi/processor_idle.c 2009-02-24 14:39:04.000000000 +0800 @@ -69,6 +69,7 @@ #define C2_OVERHEAD 1 /* 1us */ #define C3_OVERHEAD 1 /* 1us */ #define PM_TIMER_TICKS_TO_US(p) (((p) * 1000)/(PM_TIMER_FREQUENCY/1000)) +static void (*pm_idle_save)(void); static unsigned int max_cstate __read_mostly = ACPI_PROCESSOR_MAX_POWER; module_param(max_cstate, uint, 0000); @@ -866,8 +867,12 @@ /* Do not access any ACPI IO ports in suspend path */ if (acpi_idle_suspend) { - acpi_safe_halt(); - local_irq_enable(); + if (pm_idle_save) + pm_idle_save(); + else { + acpi_safe_halt(); + local_irq_enable(); + } return 0; } @@ -1206,6 +1211,12 @@ */ max_cstate = 1; } + /* + * save the previous pm_idle function so that it will be called + * in course of suspend/resume. + */ + if (!pm_idle_save) + pm_idle_save = pm_idle; dmi_check_system(processor_power_dmi_table); max_cstate = acpi_processor_cstate_check(max_cstate); if (max_cstate < ACPI_C_STATES_MAX)