summaryrefslogtreecommitdiff
path: root/cpu/microblaze/irq.S
diff options
context:
space:
mode:
authorPeter Pearse <peter.pearse@arm.com>2007-05-18 14:34:19 +0100
committerPeter Pearse <peter.pearse@arm.com>2007-05-18 14:34:19 +0100
commit879027daa838d245bf433ca2bb446bedace724f0 (patch)
tree663792e944d667843d77f81dd3d5ab56ffa7f098 /cpu/microblaze/irq.S
parent93ef45c9ddfdd9fc17c4e74bd8e2f2456580eb72 (diff)
parent70124c2602ae2d4c5d3dba05b482d91548242de8 (diff)
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'cpu/microblaze/irq.S')
-rwxr-xr-x[-rw-r--r--]cpu/microblaze/irq.S7
1 files changed, 7 insertions, 0 deletions
diff --git a/cpu/microblaze/irq.S b/cpu/microblaze/irq.S
index a4e3fbfad67..e1fc19046c7 100644..100755
--- 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