diff options
| author | Andi Kleen <ak@suse.de> | 2006-03-25 20:24:07 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 23:19:29 -0500 |
| commit | 0b5c59a1e41636afa77b90d34e8c394d8d929733 (patch) | |
| tree | 99a587f48138d47c3a46a91549358cc147fef96b | |
| parent | 7d3aee9a9686ffc235c343dcab85c3ebea78908a (diff) | |
[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.c | 6 |
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) | |||
| 876 | { | 876 | { |
| 877 | unsigned int i; | 877 | unsigned int i; |
| 878 | unsigned int working = 0; | 878 | unsigned int working = 0; |
| 879 | int timer_broadcast = 0; | ||
| 880 | cpumask_t mask = cpumask_of_cpu(pr->id); | ||
| 881 | 879 | ||
| 882 | #ifdef ARCH_APICTIMER_STOPS_ON_C3 | 880 | #ifdef ARCH_APICTIMER_STOPS_ON_C3 |
| 881 | int timer_broadcast = 0; | ||
| 882 | cpumask_t mask = cpumask_of_cpu(pr->id); | ||
| 883 | on_each_cpu(switch_ipi_to_APIC_timer, &mask, 1, 1); | 883 | on_each_cpu(switch_ipi_to_APIC_timer, &mask, 1, 1); |
| 884 | #endif | 884 | #endif |
| 885 | 885 | ||
| @@ -915,8 +915,10 @@ static int acpi_processor_power_verify(struct acpi_processor *pr) | |||
| 915 | working++; | 915 | working++; |
| 916 | } | 916 | } |
| 917 | 917 | ||
| 918 | #ifdef ARCH_APICTIMER_STOPS_ON_C3 | ||
| 918 | if (timer_broadcast) | 919 | if (timer_broadcast) |
| 919 | on_each_cpu(switch_APIC_timer_to_ipi, &mask, 1, 1); | 920 | on_each_cpu(switch_APIC_timer_to_ipi, &mask, 1, 1); |
| 921 | #endif | ||
| 920 | 922 | ||
| 921 | return (working); | 923 | return (working); |
| 922 | } | 924 | } |
