From owner-svn-src-head@FreeBSD.ORG  Sun Jun  9 08:28:24 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 C93F6F27;
 Sun,  9 Jun 2013 08:28:24 +0000 (UTC) (envelope-from ed@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 BC1101D1A;
 Sun,  9 Jun 2013 08:28:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r598SOro026011;
 Sun, 9 Jun 2013 08:28:24 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r598SORB026010;
 Sun, 9 Jun 2013 08:28:24 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201306090828.r598SORB026010@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 9 Jun 2013 08:28:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251566 - head/sys/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.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Jun 2013 08:28:24 -0000

Author: ed
Date: Sun Jun  9 08:28:23 2013
New Revision: 251566
URL: http://svnweb.freebsd.org/changeset/base/251566

Log:
  Fix the way atomic_is_lock_free() is defined for Clang.
  
  When using Clang atomics, atomic types are not placed in a structure.
  There is thus no reason why we should get the __val member.

Modified:
  head/sys/sys/stdatomic.h

Modified: head/sys/sys/stdatomic.h
==============================================================================
--- head/sys/sys/stdatomic.h	Sun Jun  9 08:06:26 2013	(r251565)
+++ head/sys/sys/stdatomic.h	Sun Jun  9 08:28:23 2013	(r251566)
@@ -156,7 +156,10 @@ enum memory_order {
  * 7.17.5 Lock-free property.
  */
 
-#if defined(__CLANG_ATOMICS) || defined(__GNUC_ATOMICS)
+#if defined(__CLANG_ATOMICS)
+#define	atomic_is_lock_free(obj) \
+	__atomic_is_lock_free(sizeof(*(obj)), obj)
+#elif defined(__GNUC_ATOMICS)
 #define	atomic_is_lock_free(obj) \
 	__atomic_is_lock_free(sizeof((obj)->__val), &(obj)->__val)
 #else