From owner-svn-src-stable-9@FreeBSD.ORG  Fri Mar  8 21:03:36 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@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 437AB87D;
 Fri,  8 Mar 2013 21:03:36 +0000 (UTC)
 (envelope-from rstone@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 1D7AAA4A;
 Fri,  8 Mar 2013 21:03:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r28L3ZSk066456;
 Fri, 8 Mar 2013 21:03:35 GMT (envelope-from rstone@svn.freebsd.org)
Received: (from rstone@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r28L3Z8Z066455;
 Fri, 8 Mar 2013 21:03:35 GMT (envelope-from rstone@svn.freebsd.org)
Message-Id: <201303082103.r28L3Z8Z066455@svn.freebsd.org>
From: Ryan Stone <rstone@FreeBSD.org>
Date: Fri, 8 Mar 2013 21:03:35 +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: r248071 - stable/9/sys/cddl/dev/dtrace
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-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Mar 2013 21:03:36 -0000

Author: rstone
Date: Fri Mar  8 21:03:35 2013
New Revision: 248071
URL: http://svnweb.freebsd.org/changeset/base/248071

Log:
  MFC r226452 (by marcel@)
  
    Define dtrace_cmpset_long in terms of atomic_cmpset_long
    and not by virtue of inline assembly. Now this file
    compiles on all supported architectures.

Modified:
  stable/9/sys/cddl/dev/dtrace/dtrace_debug.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cddl/dev/dtrace/dtrace_debug.c
==============================================================================
--- stable/9/sys/cddl/dev/dtrace/dtrace_debug.c	Fri Mar  8 20:33:50 2013	(r248070)
+++ stable/9/sys/cddl/dev/dtrace/dtrace_debug.c	Fri Mar  8 21:03:35 2013	(r248071)
@@ -31,49 +31,9 @@
 
 #ifdef DEBUG
 
-#if defined(__amd64__)
-static __inline int
-dtrace_cmpset_long(volatile u_long *dst, u_long exp, u_long src)
-{
-	u_char res;
-
-	__asm __volatile(
-	"	 lock ; 		"
-	"	cmpxchgq %2,%1 ;	"
-	"       sete	%0 ;		"
-	"1:				"
-	"# dtrace_cmpset_long"
-	: "=a" (res),			/* 0 */
-	  "=m" (*dst)			/* 1 */
-	: "r" (src),			/* 2 */
-	  "a" (exp),			/* 3 */
-	  "m" (*dst)			/* 4 */
-	: "memory");
-
-	return (res);
-}
-#elif defined(__i386__)
-static __inline int
-dtrace_cmpset_long(volatile u_long *dst, u_long exp, u_long src)
-{
-	u_char res;
-
-	__asm __volatile(
-	"        lock ;            	"
-	"       cmpxchgl %2,%1 ;        "
-	"       sete    %0 ;            "
-	"1:                             "
-	"# dtrace_cmpset_long"
-	: "=a" (res),                   /* 0 */
-	  "=m" (*dst)                   /* 1 */
-	: "r" (src),                    /* 2 */
-	  "a" (exp),                    /* 3 */
-	  "m" (*dst)                    /* 4 */
-	: "memory");
+#include <machine/atomic.h>
 
-	return (res);
-}
-#endif
+#define	dtrace_cmpset_long	atomic_cmpset_long
 
 #define DTRACE_DEBUG_BUFR_SIZE	(32 * 1024)