diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-12 17:04:23 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-12 17:04:23 -0400 |
commit | 43ca7ec96f01bd921e772112729005d4474fdbf4 (patch) | |
tree | 067be7741666150fa689b42c917f9aaf25e3c761 /drivers/acpi | |
parent | 5b94664a3a2a4f3c516a4a2f454f3c811cb25959 (diff) |
ACPI: remove the now unused ifdef code
The conversion of x86-64 to clock events makes the
#ifdef CONFIG_GENERIC_CLOCKEVENTS
n the timer broadcast functions useless. Remove it.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/processor_idle.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 1e8287b4f40c..1f6fb38de017 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
@@ -276,21 +276,12 @@ static void acpi_timer_check_state(int state, struct acpi_processor *pr, | |||
276 | 276 | ||
277 | static void acpi_propagate_timer_broadcast(struct acpi_processor *pr) | 277 | static void acpi_propagate_timer_broadcast(struct acpi_processor *pr) |
278 | { | 278 | { |
279 | #ifdef CONFIG_GENERIC_CLOCKEVENTS | ||
280 | unsigned long reason; | 279 | unsigned long reason; |
281 | 280 | ||
282 | reason = pr->power.timer_broadcast_on_state < INT_MAX ? | 281 | reason = pr->power.timer_broadcast_on_state < INT_MAX ? |
283 | CLOCK_EVT_NOTIFY_BROADCAST_ON : CLOCK_EVT_NOTIFY_BROADCAST_OFF; | 282 | CLOCK_EVT_NOTIFY_BROADCAST_ON : CLOCK_EVT_NOTIFY_BROADCAST_OFF; |
284 | 283 | ||
285 | clockevents_notify(reason, &pr->id); | 284 | clockevents_notify(reason, &pr->id); |
286 | #else | ||
287 | cpumask_t mask = cpumask_of_cpu(pr->id); | ||
288 | |||
289 | if (pr->power.timer_broadcast_on_state < INT_MAX) | ||
290 | on_each_cpu(switch_APIC_timer_to_ipi, &mask, 1, 1); | ||
291 | else | ||
292 | on_each_cpu(switch_ipi_to_APIC_timer, &mask, 1, 1); | ||
293 | #endif | ||
294 | } | 285 | } |
295 | 286 | ||
296 | /* Power(C) State timer broadcast control */ | 287 | /* Power(C) State timer broadcast control */ |
@@ -298,8 +289,6 @@ static void acpi_state_timer_broadcast(struct acpi_processor *pr, | |||
298 | struct acpi_processor_cx *cx, | 289 | struct acpi_processor_cx *cx, |
299 | int broadcast) | 290 | int broadcast) |
300 | { | 291 | { |
301 | #ifdef CONFIG_GENERIC_CLOCKEVENTS | ||
302 | |||
303 | int state = cx - pr->power.states; | 292 | int state = cx - pr->power.states; |
304 | 293 | ||
305 | if (state >= pr->power.timer_broadcast_on_state) { | 294 | if (state >= pr->power.timer_broadcast_on_state) { |
@@ -309,7 +298,6 @@ static void acpi_state_timer_broadcast(struct acpi_processor *pr, | |||
309 | CLOCK_EVT_NOTIFY_BROADCAST_EXIT; | 298 | CLOCK_EVT_NOTIFY_BROADCAST_EXIT; |
310 | clockevents_notify(reason, &pr->id); | 299 | clockevents_notify(reason, &pr->id); |
311 | } | 300 | } |
312 | #endif | ||
313 | } | 301 | } |
314 | 302 | ||
315 | #else | 303 | #else |