From owner-svn-src-all@FreeBSD.ORG  Mon Sep  1 18:28:12 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5976C45B;
 Mon,  1 Sep 2014 18:28:12 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 455201F0C;
 Mon,  1 Sep 2014 18:28:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s81ISCLS082143;
 Mon, 1 Sep 2014 18:28:12 GMT (envelope-from ed@FreeBSD.org)
Received: (from ed@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s81ISCF6082142;
 Mon, 1 Sep 2014 18:28:12 GMT (envelope-from ed@FreeBSD.org)
Message-Id: <201409011828.s81ISCF6082142@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ed set sender to ed@FreeBSD.org
 using -f
From: Ed Schouten <ed@FreeBSD.org>
Date: Mon, 1 Sep 2014 18:28:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270942 - 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-all@freebsd.org
X-Mailman-Version: 2.1.18-1
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Sep 2014 18:28:12 -0000

Author: ed
Date: Mon Sep  1 18:28:11 2014
New Revision: 270942
URL: http://svnweb.freebsd.org/changeset/base/270942

Log:
  Enable lock annotations on HEAD when using Clang.
  
  MFC after:	never

Modified:
  head/sys/sys/cdefs.h

Modified: head/sys/sys/cdefs.h
==============================================================================
--- head/sys/sys/cdefs.h	Mon Sep  1 18:27:04 2014	(r270941)
+++ head/sys/sys/cdefs.h	Mon Sep  1 18:28:11 2014	(r270942)
@@ -749,12 +749,13 @@
  * Furthermore, it is also possible to annotate variables and structure
  * members to enforce that they are only accessed when certain locks are
  * held.
- *
- * Note: These annotations have no effect on this version of FreeBSD.
- * They are merely provided for forward compatibilty.
  */
 
+#ifdef __clang__
+#define	__lock_annotate(x)	__attribute__((x))
+#else
 #define	__lock_annotate(x)
+#endif
 
 /* Structure implements a lock. */
 #define	__lockable		__lock_annotate(lockable)