From owner-svn-src-head@freebsd.org  Tue Jan  3 21:02:31 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 3B713C9E2BA;
 Tue,  3 Jan 2017 21:02:31 +0000 (UTC) (envelope-from mjg@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 0AE1C199B;
 Tue,  3 Jan 2017 21:02:30 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v03L2Uji096985;
 Tue, 3 Jan 2017 21:02:30 GMT (envelope-from mjg@FreeBSD.org)
Received: (from mjg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v03L2UPb096984;
 Tue, 3 Jan 2017 21:02:30 GMT (envelope-from mjg@FreeBSD.org)
Message-Id: <201701032102.v03L2UPb096984@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org
 using -f
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Tue, 3 Jan 2017 21:02:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r311170 - head/sys/cddl/compat/opensolaris/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jan 2017 21:02:31 -0000

Author: mjg
Date: Tue Jan  3 21:02:30 2017
New Revision: 311170
URL: https://svnweb.freebsd.org/changeset/base/311170

Log:
  Revert r309619 "ifndef atomic_cas_* in cddl code"
  
  It was a temporary change to ease an import of native atomic_cas primitives.
  Instead, atomic_fcmpset was devised with different semantics. See r311168.

Modified:
  head/sys/cddl/compat/opensolaris/sys/atomic.h

Modified: head/sys/cddl/compat/opensolaris/sys/atomic.h
==============================================================================
--- head/sys/cddl/compat/opensolaris/sys/atomic.h	Tue Jan  3 21:00:24 2017	(r311169)
+++ head/sys/cddl/compat/opensolaris/sys/atomic.h	Tue Jan  3 21:02:30 2017	(r311170)
@@ -41,15 +41,11 @@ extern void atomic_add_64(volatile uint6
 extern void atomic_dec_64(volatile uint64_t *target);
 #endif
 #ifndef __sparc64__
-#ifndef atomic_cas_32
 extern uint32_t atomic_cas_32(volatile uint32_t *target, uint32_t cmp,
     uint32_t newval);
-#endif
-#ifndef atomic_cas_64
 extern uint64_t atomic_cas_64(volatile uint64_t *target, uint64_t cmp,
     uint64_t newval);
 #endif
-#endif
 extern uint64_t atomic_add_64_nv(volatile uint64_t *target, int64_t delta);
 extern uint8_t atomic_or_8_nv(volatile uint8_t *target, uint8_t value);
 extern void membar_producer(void);
@@ -127,7 +123,6 @@ atomic_dec_64_nv(volatile uint64_t *targ
 	return (atomic_add_64_nv(target, -1));
 }
 
-#ifndef atomic_cas_ptr
 #if !defined(COMPAT_32BIT) && defined(__LP64__)
 static __inline void *
 atomic_cas_ptr(volatile void *target, void *cmp,  void *newval)
@@ -143,6 +138,5 @@ atomic_cas_ptr(volatile void *target, vo
 	    (uint32_t)cmp, (uint32_t)newval));
 }
 #endif	/* !defined(COMPAT_32BIT) && defined(__LP64__) */
-#endif
 
 #endif	/* !_OPENSOLARIS_SYS_ATOMIC_H_ */