From: Andi Kleen Date: Sun, 26 Mar 2006 01:24:07 +0000 (+0100) Subject: [PATCH] Fix compilation of processor_idle.c on IA64 X-Git-Tag: v2.6.17-rc1~662 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0b5c59a1e41636afa77b90d34e8c394d8d929733;p=linux-2.6-omap-h63xx.git [PATCH] Fix compilation of processor_idle.c on IA64 Broken earlier by me by a x86-64 patch. The code was optimized away, but the compiler still complained about an undeclared function. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds --- diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 2be89589594..80fa43471f4 100644 --- a/drivers/acpi/processor_idle.c +++ b/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); }