summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-03-26 03:24:07 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-26 06:19:29 +0200
commit0b5c59a1e41636afa77b90d34e8c394d8d929733 (patch)
tree99a587f48138d47c3a46a91549358cc147fef96b
parent[SPARC64]: Keep cpu_present_map in sync with phys_cpu_present_map. (diff)
downloadlinux-0b5c59a1e41636afa77b90d34e8c394d8d929733.tar.xz
linux-0b5c59a1e41636afa77b90d34e8c394d8d929733.zip
[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 <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/acpi/processor_idle.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 2be895895943..80fa43471f48 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);
}