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

Commit c948c260 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/apic: Drop local_irq_save/restore in timer callbacks 



These callbacks are called with interrupts disabled from the core
code. Fixup the local caller to disable interrupts.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
parent b23d8e52

arch/x86/kernel/apic/apic.c

+3 −15
Original line number Diff line number Diff line
@@ -464,40 +464,27 @@ static int lapic_next_deadline(unsigned long delta, 


static int lapic_timer_shutdown(struct clock_event_device *evt)

{

	unsigned long flags;

	unsigned int v;



	/* Lapic used as dummy for broadcast ? */

	if (evt->features & CLOCK_EVT_FEAT_DUMMY)

		return 0;



	local_irq_save(flags);



	v = apic_read(APIC_LVTT);

	v |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);

	apic_write(APIC_LVTT, v);

	apic_write(APIC_TMICT, 0);



	local_irq_restore(flags);



	return 0;

}



static inline int

lapic_timer_set_periodic_oneshot(struct clock_event_device *evt, bool oneshot)

{

	unsigned long flags;



	/* Lapic used as dummy for broadcast ? */

	if (evt->features & CLOCK_EVT_FEAT_DUMMY)

		return 0;



	local_irq_save(flags);



	__setup_APIC_LVTT(lapic_timer_frequency, oneshot, 1);



	local_irq_restore(flags);



	return 0;

}
@@ -804,6 +791,7 @@ static int __init calibrate_APIC_clock(void) 
			cpu_relax();



		/* Stop the lapic timer */

		local_irq_disable();

		lapic_timer_shutdown(levt);



		/* Jiffies delta */
@@ -815,7 +803,7 @@ static int __init calibrate_APIC_clock(void) 
			apic_printk(APIC_VERBOSE, "... jiffies result ok\n");

		else

			levt->features |= CLOCK_EVT_FEAT_DUMMY;

	} else

	}

	local_irq_enable();



	if (levt->features & CLOCK_EVT_FEAT_DUMMY) {