X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=arch%2Ftile%2Fkernel%2Fintvec_64.S;h=b8fc497f24370c0d7c17536664cb19c40923e5bf;hb=46f37519cf219ce899694b6db7c16f3a86cae8af;hp=ec755d3f373467ebe271dd1743cc6f56b6f9d7da;hpb=e9ff04dd94d46c817bbb103531cdef6e7bd5d022;p=~andy%2Flinux

diff --git a/arch/tile/kernel/intvec_64.S b/arch/tile/kernel/intvec_64.S
index ec755d3f373..b8fc497f243 100644
--- a/arch/tile/kernel/intvec_64.S
+++ b/arch/tile/kernel/intvec_64.S
@@ -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: