From owner-svn-src-head@FreeBSD.ORG  Tue Sep  2 23:43:07 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 6027F685;
 Tue,  2 Sep 2014 23:43:07 +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 4B7A41789;
 Tue,  2 Sep 2014 23:43:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s82Nh7G0042044;
 Tue, 2 Sep 2014 23:43:07 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s82Nh6FH042040;
 Tue, 2 Sep 2014 23:43:06 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201409022343.s82Nh6FH042040@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 2 Sep 2014 23:43:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270990 - in head: share/mk 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.18-1
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: Tue, 02 Sep 2014 23:43:07 -0000

Author: markj
Date: Tue Sep  2 23:43:06 2014
New Revision: 270990
URL: http://svnweb.freebsd.org/changeset/base/270990

Log:
  Define _DTRACE_VERSION in sdt.h rather than setting it manually. This is
  similar to what illumos does, and makes it easier to enable USDT probes
  in third-party software that doesn't make use of the system makefiles.

Modified:
  head/share/mk/bsd.dep.mk
  head/sys/sys/sdt.h

Modified: head/share/mk/bsd.dep.mk
==============================================================================
--- head/share/mk/bsd.dep.mk	Tue Sep  2 22:59:40 2014	(r270989)
+++ head/share/mk/bsd.dep.mk	Tue Sep  2 23:43:06 2014	(r270990)
@@ -125,7 +125,7 @@ ${_YC:R}.o: ${_YC}
 .if ${SRCS:M*.d}
 LDFLAGS+=	-lelf
 LDADD+=		${LIBELF}
-CFLAGS+=	-D_DTRACE_VERSION=1 -I${.OBJDIR}
+CFLAGS+=	-I${.OBJDIR}
 .endif
 .for _DSRC in ${SRCS:M*.d:N*/*}
 .for _D in ${_DSRC:R}

Modified: head/sys/sys/sdt.h
==============================================================================
--- head/sys/sys/sdt.h	Tue Sep  2 22:59:40 2014	(r270989)
+++ head/sys/sys/sdt.h	Tue Sep  2 23:43:06 2014	(r270990)
@@ -33,6 +33,8 @@
 
 #ifndef _KERNEL
 
+#define	_DTRACE_VERSION	1
+
 #define	DTRACE_PROBE(prov, name) {				\
 	extern void __dtrace_##prov##___##name(void);		\
 	__dtrace_##prov##___##name();				\