From owner-svn-src-stable@FreeBSD.ORG  Mon Oct 22 11:10:14 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 90ACFD77;
 Mon, 22 Oct 2012 11:10:14 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 788748FC08;
 Mon, 22 Oct 2012 11:10:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9MBAE8b097754;
 Mon, 22 Oct 2012 11:10:14 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9MBAEMI097752;
 Mon, 22 Oct 2012 11:10:14 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201210221110.q9MBAEMI097752@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 22 Oct 2012 11:10:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r241878 - stable/9/sys/sparc64/sparc64
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Oct 2012 11:10:14 -0000

Author: marius
Date: Mon Oct 22 11:10:14 2012
New Revision: 241878
URL: http://svn.freebsd.org/changeset/base/241878

Log:
  MFC: r241740
  
  - Remove an unused header.
  - Don't waste a delay slot.

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	Mon Oct 22 11:07:59 2012	(r241877)
+++ stable/9/sys/sparc64/sparc64/interrupt.S	Mon Oct 22 11:10:14 2012	(r241878)
@@ -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
 
 	/*