X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cpu%2Fmicroblaze%2Firq.S;h=e1fc19046c721ee98e0c332c76506f7431ccef35;hb=ad9073211ca9e62162a39851e082b8d07a662fb6;hp=a4e3fbfad674fbd17c3398ea5c305b98dec2b207;hpb=1d10b9e99d1b4a6a880d424ec791cde45cb04614;p=oweals%2Fu-boot.git

diff --git a/cpu/microblaze/irq.S b/cpu/microblaze/irq.S
index a4e3fbfad6..e1fc19046c 100644
--- a/cpu/microblaze/irq.S
+++ b/cpu/microblaze/irq.S
@@ -23,6 +23,7 @@
  */
 
 #include <config.h>
+#include <asm/asm.h>
 	.text
 	.global _interrupt_handler
 _interrupt_handler:
@@ -151,6 +152,11 @@ _interrupt_handler:
 	addi	r1, r1, 4
 
 	/* enable_interrupt */
+#ifdef XILINX_USE_MSR_INSTR
+	msrset	r0, 2
+#else
+	/* FIXME unstable in stressed mode - two irqs */
+	nop
 	addi	r1, r1, -4
 	swi	r12, r1, 0
 	mfs	r12, rmsr
@@ -159,6 +165,7 @@ _interrupt_handler:
 	lwi	r12, r1, 0
 	addi	r1, r1, 4
 	nop
+#endif
 	bra	r14
 	nop
 	nop