diff --git a/[refs] b/[refs] index efb3feda3343..7015fca24998 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d3aee9a9686ffc235c343dcab85c3ebea78908a +refs/heads/master: 0b5c59a1e41636afa77b90d34e8c394d8d929733 diff --git a/trunk/drivers/acpi/processor_idle.c b/trunk/drivers/acpi/processor_idle.c index 2be895895943..80fa43471f48 100644 --- a/trunk/drivers/acpi/processor_idle.c +++ b/trunk/drivers/acpi/processor_idle.c @@ -876,10 +876,10 @@ static int acpi_processor_power_verify(struct acpi_processor *pr) { unsigned int i; unsigned int working = 0; - int timer_broadcast = 0; - cpumask_t mask = cpumask_of_cpu(pr->id); #ifdef ARCH_APICTIMER_STOPS_ON_C3 + int timer_broadcast = 0; + cpumask_t mask = cpumask_of_cpu(pr->id); on_each_cpu(switch_ipi_to_APIC_timer, &mask, 1, 1); #endif @@ -915,8 +915,10 @@ static int acpi_processor_power_verify(struct acpi_processor *pr) working++; } +#ifdef ARCH_APICTIMER_STOPS_ON_C3 if (timer_broadcast) on_each_cpu(switch_APIC_timer_to_ipi, &mask, 1, 1); +#endif return (working); }