From owner-svn-src-stable-8@FreeBSD.ORG  Sun Jan 27 23:08:56 2013
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 867ABEB;
 Sun, 27 Jan 2013 23:08:56 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 70484B26;
 Sun, 27 Jan 2013 23:08:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0RN8u8F023036;
 Sun, 27 Jan 2013 23:08:56 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0RN8uDM023035;
 Sun, 27 Jan 2013 23:08:56 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201301272308.r0RN8uDM023035@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 27 Jan 2013 23:08:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r246012 - stable/8/sys/sparc64/sparc64
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
 <svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-8>, 
 <mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
 <mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Jan 2013 23:08:56 -0000

Author: marius
Date: Sun Jan 27 23:08:55 2013
New Revision: 246012
URL: http://svnweb.freebsd.org/changeset/base/246012

Log:
  MFC: r245017
  
  Revert bogus part of r241740 (MFC'ed to stable/8 in r241879).
  Reported by:	Michael Moll

Modified:
  stable/8/sys/sparc64/sparc64/interrupt.S
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/sparc64/   (props changed)

Modified: stable/8/sys/sparc64/sparc64/interrupt.S
==============================================================================
--- stable/8/sys/sparc64/sparc64/interrupt.S	Sun Jan 27 23:08:51 2013	(r246011)
+++ stable/8/sys/sparc64/sparc64/interrupt.S	Sun Jan 27 23:08:55 2013	(r246012)
@@ -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
 
 	/*