From owner-svn-src-all@FreeBSD.ORG  Sat Sep 21 22:43:50 2013
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 ESMTP id BE1F14C2;
 Sat, 21 Sep 2013 22:43:50 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id AB1B72CF9;
 Sat, 21 Sep 2013 22:43:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8LMhoZG023965;
 Sat, 21 Sep 2013 22:43:50 GMT (envelope-from markj@svn.freebsd.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8LMhoTp023964;
 Sat, 21 Sep 2013 22:43:50 GMT (envelope-from markj@svn.freebsd.org)
Message-Id: <201309212243.r8LMhoTp023964@svn.freebsd.org>
From: Mark Johnston <markj@FreeBSD.org>
Date: Sat, 21 Sep 2013 22:43:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255776 - 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.14
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: Sat, 21 Sep 2013 22:43:50 -0000

Author: markj
Date: Sat Sep 21 22:43:50 2013
New Revision: 255776
URL: http://svnweb.freebsd.org/changeset/base/255776

Log:
  Give argtype struct names a different prefix than probe struct names.
  Otherwise it's possible to declare SDT probes in such a way that a name
  collision occurs, causing an unexpected compilation error.
  
  Approved by:	re (gjb)
  MFC after:	1 week

Modified:
  head/sys/sys/sdt.h

Modified: head/sys/sys/sdt.h
==============================================================================
--- head/sys/sys/sdt.h	Sat Sep 21 22:36:07 2013	(r255775)
+++ head/sys/sys/sdt.h	Sat Sep 21 22:43:50 2013	(r255776)
@@ -160,11 +160,11 @@ SET_DECLARE(sdt_argtypes_set, struct sdt
 } while (0)
 
 #define SDT_PROBE_ARGTYPE(prov, mod, func, name, num, type, xtype)		\
-	static struct sdt_argtype sdt_##prov##_##mod##_##func##_##name##num[1]	\
+	static struct sdt_argtype sdta_##prov##_##mod##_##func##_##name##num[1]	\
 	    = { { num, type, xtype, { NULL, NULL },				\
 	    sdt_##prov##_##mod##_##func##_##name }				\
 	};									\
-	DATA_SET(sdt_argtypes_set, sdt_##prov##_##mod##_##func##_##name##num);
+	DATA_SET(sdt_argtypes_set, sdta_##prov##_##mod##_##func##_##name##num);
 
 #define	SDT_PROBE_DEFINE0(prov, mod, func, name, sname)			\
 	SDT_PROBE_DEFINE(prov, mod, func, name, sname)