diff options
| author | Marius Strobl <marius@FreeBSD.org> | 2013-01-03 23:12:08 +0000 |
|---|---|---|
| committer | Marius Strobl <marius@FreeBSD.org> | 2013-01-03 23:12:08 +0000 |
| commit | 369109e25478a734cd3581b311c949e7eeac4cf4 (patch) | |
| tree | d6451920f985e4fad3ee3e62320d1b948c843d03 /sys/sparc64 | |
| parent | e0418c03e741083b6ef8e6ebaf05b07787e31150 (diff) | |
| download | src-369109e25478a734cd3581b311c949e7eeac4cf4.tar.gz src-369109e25478a734cd3581b311c949e7eeac4cf4.zip | |
Revert bogus part of r241740.
Reported by: Michael Moll
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=245017
Diffstat (limited to 'sys/sparc64')
| -rw-r--r-- | sys/sparc64/sparc64/interrupt.S | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/sparc64/sparc64/interrupt.S b/sys/sparc64/sparc64/interrupt.S index fc144f4a9575..179eeb6400dc 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 /* |