48c48
< * $FreeBSD: stable/9/sys/security/mac/mac_internal.h 262056 2014-02-17 13:53:01Z avg $
---
> * $FreeBSD: stable/9/sys/security/mac/mac_internal.h 262057 2014-02-17 13:58:50Z avg $
77,80c77,80
< 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);
83,86c83,86
< 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);
89,92c89,92
< 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);
95,98c95,98
< 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);
102c102
< SDT_PROBE(mac_framework, kernel, name, mac_check_err, \
---
> SDT_PROBE(mac_framework, kernel, name, mac__check__err, \
105c105
< SDT_PROBE(mac_framework, kernel, name, mac_check_ok, \
---
> SDT_PROBE(mac_framework, kernel, name, mac__check__ok, \
119,122c119,122
< 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);
126c126
< SDT_PROBE(mac_framework, kernel, name, mac_grant_err, \
---
> SDT_PROBE(mac_framework, kernel, name, mac__grant__err, \
129c129
< SDT_PROBE(mac_framework, kernel, name, mac_grant_ok, \
---
> SDT_PROBE(mac_framework, kernel, name, mac__grant__ok, \