diff options
| author | marius <marius@FreeBSD.org> | 2012-10-19 17:12:55 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2012-10-19 17:12:55 +0000 |
| commit | 0e1f679c3174ebf7dcba14f928ac45b056002ba8 (patch) | |
| tree | 9e821a0b77561575b2bc8a795c4caa9c36217284 /sys/sparc64 | |
| parent | 1b6a3e2a9380bf85c5beb56f8cbb2ea4fa10682d (diff) | |
| download | FreeBSD-src-0e1f679c3174ebf7dcba14f928ac45b056002ba8.zip FreeBSD-src-0e1f679c3174ebf7dcba14f928ac45b056002ba8.tar.gz | |
- Remove an unused header.
- Don't waste a delay slot.
MFC after: 3 days
Diffstat (limited to 'sys/sparc64')
| -rw-r--r-- | sys/sparc64/sparc64/interrupt.S | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/sparc64/sparc64/interrupt.S b/sys/sparc64/sparc64/interrupt.S index 3f80445..fc144f4 100644 --- a/sys/sparc64/sparc64/interrupt.S +++ b/sys/sparc64/sparc64/interrupt.S @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include <machine/asi.h> #include <machine/asmacros.h> #include <machine/intr_machdep.h> -#include <machine/ktr.h> #include <machine/pstate.h> #include <machine/ver.h> @@ -84,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,pt %g3, 1f + brnz,a,pt %g3, 1f + srlx %g3, 60, %g6 /* * NB: Zeus CPUs set some undocumented bits in the first data word. */ - and %g3, IV_MAX - 1, %g3 jmpl %g4, %g0 - nop + and %g3, IV_MAX - 1, %g3 /* NOTREACHED */ /* @@ -99,8 +98,7 @@ ENTRY(intr_vector) * 4 bits of the 1st data word specify a priority, and the 2nd and * 3rd a function and argument. */ -1: srlx %g3, 60, %g6 - brnz,a,pn %g6, 2f +1: brnz,a,pn %g6, 2f clr %g3 /* |
