From owner-svn-src-all@freebsd.org  Wed Dec 30 00:17:38 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5291FA55BFA;
 Wed, 30 Dec 2015 00:17:38 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 22C4F184A;
 Wed, 30 Dec 2015 00:17:38 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBU0HbnQ041601;
 Wed, 30 Dec 2015 00:17:37 GMT (envelope-from marius@FreeBSD.org)
Received: (from marius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBU0Hb6T041600;
 Wed, 30 Dec 2015 00:17:37 GMT (envelope-from marius@FreeBSD.org)
Message-Id: <201512300017.tBU0Hb6T041600@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marius set sender to
 marius@FreeBSD.org using -f
From: Marius Strobl <marius@FreeBSD.org>
Date: Wed, 30 Dec 2015 00:17:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r292897 - head/sys/sparc64/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Dec 2015 00:17:38 -0000

Author: marius
Date: Wed Dec 30 00:17:37 2015
New Revision: 292897
URL: https://svnweb.freebsd.org/changeset/base/292897

Log:
  Adapt CATR() to r283283.

Modified:
  head/sys/sparc64/include/ktr.h

Modified: head/sys/sparc64/include/ktr.h
==============================================================================
--- head/sys/sparc64/include/ktr.h	Wed Dec 30 00:04:57 2015	(r292896)
+++ head/sys/sparc64/include/ktr.h	Wed Dec 30 00:17:37 2015	(r292897)
@@ -74,9 +74,9 @@ l2:	add	r2, 1, r3 ; \
  * NB: this clobbers %y.
  */
 #define CATR(mask, desc, r1, r2, r3, l1, l2, l3) \
-	set	mask, r1 ; \
-	SET(ktr_mask, r3, r2) ; \
-	lduw	[r2], r2 ; \
+	setx	mask, r3, r1 ; \
+	setx	ktr_mask, r3, r2 ; \
+	ldx	[r2], r2 ; \
 	and	r2, r1, r1 ; \
 	brz	r1, l3 ## f ; \
 	 nop ; \