Author: marius
Date: Sun Jan 27 23:08:51 2013
New Revision: 246011
URL: http://svnweb.freebsd.org/changeset/base/246011
Log:
MFC: r245017
Revert bogus part of r241740 (MFC'ed to stable/9 in r241878).
Reported by: Michael Moll
Modified:
stable/9/sys/sparc64/sparc64/interrupt.S
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/sparc64/sparc64/interrupt.S
==============================================================================
--- stable/9/sys/sparc64/sparc64/interrupt.S Sun Jan 27 23:05:27 2013
(r246010)
+++ stable/9/sys/sparc64/sparc64/interrupt.S Sun Jan 27 23:08:51 2013
(r246011)
@@ -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
/*
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"
