svn commit: r262033 - stable/9/sys/sys

[Andriy Gapon]

Author: avg
Date: Mon Feb 17 12:14:50 2014
New Revision: 262033
URL: http://svnweb.freebsd.org/changeset/base/262033

Log:
  MFC r255776: Give argtype struct names a different prefix than probe
  struct names

Modified:
  stable/9/sys/sys/sdt.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/sys/   (props changed)

Modified: stable/9/sys/sys/sdt.h
==============================================================================
--- stable/9/sys/sys/sdt.h	Mon Feb 17 12:12:32 2014	(r262032)
+++ stable/9/sys/sys/sdt.h	Mon Feb 17 12:14:50 2014	(r262033)
@@ -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)