From c1dbdbde60b3dce381c43d96c9f234e354d4e721 Mon Sep 17 00:00:00 2001
From: avg <avg@FreeBSD.org>
Date: Fri, 17 Jan 2014 10:58:59 +0000
Subject: MFC r258622: dtrace sdt: remove the ugly sname parameter of
 SDT_PROBE_DEFINE

---
 sys/security/mac/mac_framework.c |  6 ++---
 sys/security/mac/mac_internal.h  | 48 ++++++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'sys/security')

diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c
index 25ffa91..2707310 100644
--- a/sys/security/mac/mac_framework.c
+++ b/sys/security/mac/mac_framework.c
@@ -94,11 +94,11 @@ __FBSDID("$FreeBSD$");
 SDT_PROVIDER_DEFINE(mac);
 SDT_PROVIDER_DEFINE(mac_framework);
 
-SDT_PROBE_DEFINE2(mac, kernel, policy, modevent, modevent, "int",
+SDT_PROBE_DEFINE2(mac, kernel, policy, modevent, "int",
     "struct mac_policy_conf *");
-SDT_PROBE_DEFINE1(mac, kernel, policy, register, register,
+SDT_PROBE_DEFINE1(mac, kernel, policy, register,
     "struct mac_policy_conf *");
-SDT_PROBE_DEFINE1(mac, kernel, policy, unregister, unregister,
+SDT_PROBE_DEFINE1(mac, kernel, policy, unregister,
     "struct mac_policy_conf *");
 
 /*
diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h
index 6b1c50c..ceb1e87 100644
--- a/sys/security/mac/mac_internal.h
+++ b/sys/security/mac/mac_internal.h
@@ -74,35 +74,35 @@ SDT_PROVIDER_DECLARE(mac);		/* MAC Framework-level events. */
 SDT_PROVIDER_DECLARE(mac_framework);	/* Entry points to MAC. */
 
 #define	MAC_CHECK_PROBE_DEFINE4(name, arg0, arg1, arg2, arg3)		\
-	SDT_PROBE_DEFINE5(mac_framework, kernel, name, mac_check_err,	\
-	    mac-check-ok, "int", arg0, arg1, arg2, arg3);		\
-	SDT_PROBE_DEFINE5(mac_framework, kernel, name, mac_check_ok,	\
-	    mac-check-ok, "int", arg0, arg1, arg2, arg3);
+	SDT_PROBE_DEFINE5(mac_framework, kernel, name, mac__check__err,	\
+	    "int", arg0, arg1, arg2, arg3);				\
+	SDT_PROBE_DEFINE5(mac_framework, kernel, name, mac__check__ok,	\
+	    "int", arg0, arg1, arg2, arg3);
 
 #define	MAC_CHECK_PROBE_DEFINE3(name, arg0, arg1, arg2)			\
-	SDT_PROBE_DEFINE4(mac_framework, kernel, name, mac_check_err,	\
-	    mac-check-err, "int", arg0, arg1, arg2);			\
-	SDT_PROBE_DEFINE4(mac_framework, kernel, name, mac_check_ok,	\
-	    mac-check-ok, "int", arg0, arg1, arg2);
+	SDT_PROBE_DEFINE4(mac_framework, kernel, name, mac__check__err,	\
+	    "int", arg0, arg1, arg2);					\
+	SDT_PROBE_DEFINE4(mac_framework, kernel, name, mac__check__ok,	\
+	    "int", arg0, arg1, arg2);
 
 #define	MAC_CHECK_PROBE_DEFINE2(name, arg0, arg1)			\
-	SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac_check_err,	\
-	    mac-check-err, "int", arg0, arg1);				\
-	SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac_check_ok,	\
-	    mac-check-ok, "int", arg0, arg1);
+	SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac__check__err,	\
+	    "int", arg0, arg1);						\
+	SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac__check__ok,	\
+	    "int", arg0, arg1);
 
 #define	MAC_CHECK_PROBE_DEFINE1(name, arg0)				\
-	SDT_PROBE_DEFINE2(mac_framework, kernel, name, mac_check_err,	\
-	    mac-check-err, "int", arg0);				\
-	SDT_PROBE_DEFINE2(mac_framework, kernel, name, mac_check_ok,	\
-	    mac-check-ok, "int", arg0);
+	SDT_PROBE_DEFINE2(mac_framework, kernel, name, mac__check__err,	\
+	    "int", arg0);						\
+	SDT_PROBE_DEFINE2(mac_framework, kernel, name, mac__check__ok,	\
+	    "int", arg0);
 
 #define	MAC_CHECK_PROBE4(name, error, arg0, arg1, arg2, arg3)	do {	\
 	if (error) {							\
-		SDT_PROBE(mac_framework, kernel, name, mac_check_err,	\
+		SDT_PROBE(mac_framework, kernel, name, mac__check__err,	\
 		    error, arg0, arg1, arg2, arg3);			\
 	} else {							\
-		SDT_PROBE(mac_framework, kernel, name, mac_check_ok,	\
+		SDT_PROBE(mac_framework, kernel, name, mac__check__ok,	\
 		    0, arg0, arg1, arg2, arg3);				\
 	}								\
 } while (0)
@@ -116,17 +116,17 @@ SDT_PROVIDER_DECLARE(mac_framework);	/* Entry points to MAC. */
 #endif
 
 #define	MAC_GRANT_PROBE_DEFINE2(name, arg0, arg1)			\
-	SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac_grant_err,	\
-	    mac-grant-err, "int", arg0, arg1);				\
-	SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac_grant_ok,	\
-	    mac-grant-ok, "int", arg0, arg1);
+	SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac__grant__err,	\
+	    "int", arg0, arg1);						\
+	SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac__grant__ok,	\
+	    "int", arg0, arg1);
 
 #define	MAC_GRANT_PROBE2(name, error, arg0, arg1)	do {		\
 	if (error) {							\
-		SDT_PROBE(mac_framework, kernel, name, mac_grant_err,	\
+		SDT_PROBE(mac_framework, kernel, name, mac__grant__err,	\
 		    error, arg0, arg1, 0, 0);				\
 	} else {							\
-		SDT_PROBE(mac_framework, kernel, name, mac_grant_ok,	\
+		SDT_PROBE(mac_framework, kernel, name, mac__grant__ok,	\
 		    error, arg0, arg1, 0, 0);				\
 	}								\
 } while (0)
-- 
cgit v1.1