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

Commit 3f725c5b authored Sep 26, 2013 by Chris Metcalf

tile: ensure interrupts disabled for preempt_schedule_irq()



When coming from a page fault (for example), interrupts might
be enabled as we enter the code to return from interrupt.

Cc: stable@vger.kernel.org
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>

parent dd386e03

arch/tile/kernel/intvec_32.S

+3 −0

Original line number	Diff line number	Diff line
		@@ -815,6 +815,9 @@ STD_ENTRY(interrupt_return)
		}
		bzt r28, 1f
		bnz r29, 1f
		/* Disable interrupts explicitly for preemption. */
		IRQ_DISABLE(r20,r21)
		TRACE_IRQS_OFF
		jal preempt_schedule_irq
		FEEDBACK_REENTER(interrupt_return)
		1:

arch/tile/kernel/intvec_64.S

+3 −0

Original line number	Diff line number	Diff line
		@@ -841,6 +841,9 @@ STD_ENTRY(interrupt_return)
		}
		beqzt r28, 1f
		bnez r29, 1f
		/* Disable interrupts explicitly for preemption. */
		IRQ_DISABLE(r20,r21)
		TRACE_IRQS_OFF
		jal preempt_schedule_irq
		FEEDBACK_REENTER(interrupt_return)
		1: