summaryrefslogtreecommitdiffstats
path: root/sys/sparc64
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2013-01-03 23:12:08 +0000
committermarius <marius@FreeBSD.org>2013-01-03 23:12:08 +0000
commit0e18f8466bdd9fbabefc432a65066805418f6049 (patch)
treed6451920f985e4fad3ee3e62320d1b948c843d03 /sys/sparc64
parent138a713204eb7a4956fcf6b797f0750099015ac3 (diff)
downloadFreeBSD-src-0e18f8466bdd9fbabefc432a65066805418f6049.zip
FreeBSD-src-0e18f8466bdd9fbabefc432a65066805418f6049.tar.gz
Revert bogus part of r241740.
Reported by: Michael Moll MFC after: 3 days
Diffstat (limited to 'sys/sparc64')
-rw-r--r--sys/sparc64/sparc64/interrupt.S9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/sparc64/sparc64/interrupt.S b/sys/sparc64/sparc64/interrupt.S
index fc144f4..179eeb6 100644
--- a/sys/sparc64/sparc64/interrupt.S
+++ b/sys/sparc64/sparc64/interrupt.S
@@ -83,13 +83,13 @@ ENTRY(intr_vector)
* The 2nd word points to code to execute and the 3rd is an argument
* to pass. Jump to it.
*/
- brnz,a,pt %g3, 1f
- srlx %g3, 60, %g6
+ brnz,pt %g3, 1f
/*
* NB: Zeus CPUs set some undocumented bits in the first data word.
*/
- jmpl %g4, %g0
and %g3, IV_MAX - 1, %g3
+ jmpl %g4, %g0
+ nop
/* NOTREACHED */
/*
@@ -98,7 +98,8 @@ ENTRY(intr_vector)
* 4 bits of the 1st data word specify a priority, and the 2nd and
* 3rd a function and argument.
*/
-1: brnz,a,pn %g6, 2f
+1: srlx %g3, 60, %g6
+ brnz,a,pn %g6, 2f
clr %g3
/*
OpenPOWER on IntegriCloud