1 files changed, 15 insertions, 0 deletions

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 807b0df308f1..cc049338e418 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -843,6 +843,15 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
         unsigned int i;
         unsigned int working = 0;
 
+#ifdef ARCH_APICTIMER_STOPS_ON_C3
+        struct cpuinfo_x86 *c = cpu_data + pr->id;
+        cpumask_t mask = cpumask_of_cpu(pr->id);
+
+        if (c->x86_vendor == X86_VENDOR_INTEL) {
+                on_each_cpu(switch_ipi_to_APIC_timer, &mask, 1, 1);
+        }
+#endif
+
         for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
                 struct acpi_processor_cx *cx = &pr->power.states[i];
 
@@ -857,6 +866,12 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
 
                 case ACPI_STATE_C3:
                         acpi_processor_power_verify_c3(pr, cx);
+#ifdef ARCH_APICTIMER_STOPS_ON_C3
+                        if (c->x86_vendor == X86_VENDOR_INTEL) {
+                                on_each_cpu(switch_APIC_timer_to_ipi,
+                                                &mask, 1, 1);
+                        }
+#endif
                         break;
                 }