Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43ca7ec9 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Thomas Gleixner
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
parent 5b94664a

drivers/acpi/processor_idle.c

+0 −12
Original line number Diff line number Diff line
@@ -276,21 +276,12 @@ static void acpi_timer_check_state(int state, struct acpi_processor *pr, 


static void acpi_propagate_timer_broadcast(struct acpi_processor *pr)

{

#ifdef CONFIG_GENERIC_CLOCKEVENTS

	unsigned long reason;



	reason = pr->power.timer_broadcast_on_state < INT_MAX ?

		CLOCK_EVT_NOTIFY_BROADCAST_ON : CLOCK_EVT_NOTIFY_BROADCAST_OFF;



	clockevents_notify(reason, &pr->id);

#else

	cpumask_t mask = cpumask_of_cpu(pr->id);



	if (pr->power.timer_broadcast_on_state < INT_MAX)

		on_each_cpu(switch_APIC_timer_to_ipi, &mask, 1, 1);

	else

		on_each_cpu(switch_ipi_to_APIC_timer, &mask, 1, 1);

#endif

}



/* Power(C) State timer broadcast control */
@@ -298,8 +289,6 @@ static void acpi_state_timer_broadcast(struct acpi_processor *pr, 
				       struct acpi_processor_cx *cx,

				       int broadcast)

{

#ifdef CONFIG_GENERIC_CLOCKEVENTS



	int state = cx - pr->power.states;



	if (state >= pr->power.timer_broadcast_on_state) {
@@ -309,7 +298,6 @@ static void acpi_state_timer_broadcast(struct acpi_processor *pr, 
			CLOCK_EVT_NOTIFY_BROADCAST_EXIT;

		clockevents_notify(reason, &pr->id);

	}

#endif

}



#else