From owner-svn-src-stable-7@FreeBSD.ORG  Mon May 10 19:02:22 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D350B106566C;
	Mon, 10 May 2010 19:02:22 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id C20BB8FC1D;
	Mon, 10 May 2010 19:02:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4AJ2MXJ040084;
	Mon, 10 May 2010 19:02:22 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4AJ2MaI040082;
	Mon, 10 May 2010 19:02:22 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201005101902.o4AJ2MaI040082@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 10 May 2010 19:02:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207876 - stable/7/sys/sparc64/sparc64
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2010 19:02:22 -0000

Author: marius
Date: Mon May 10 19:02:22 2010
New Revision: 207876
URL: http://svn.freebsd.org/changeset/base/207876

Log:
  MFC: r207500
  
  Add a hack for SPARC64 V CPUs, which set some undocumented bits in the
  first data word.

Modified:
  stable/7/sys/sparc64/sparc64/interrupt.S
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/sparc64/sparc64/interrupt.S
==============================================================================
--- stable/7/sys/sparc64/sparc64/interrupt.S	Mon May 10 19:02:21 2010	(r207875)
+++ stable/7/sys/sparc64/sparc64/interrupt.S	Mon May 10 19:02:22 2010	(r207876)
@@ -83,8 +83,11 @@ 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
-	 nop
+	brnz,pt %g3, 1f
+	/*
+	 * NB: Zeus CPUs set some undocumented bits in the first data word.
+	 */
+	 and	%g3, IV_MAX - 1, %g3
 	jmpl	%g4, %g0
 	 nop
 	/* NOTREACHED */