diff options
| author | avg <avg@FreeBSD.org> | 2014-02-17 14:47:52 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2014-02-17 14:47:52 +0000 |
| commit | cc43c81b039ea4e8f8aec917d7a7cb781e320310 (patch) | |
| tree | e4fcd119784fae786e9ddd3c7a0d7efe2942f013 /sys/cddl/compat | |
| parent | ad9d45d42725fe3fe3ece1c4b5d217d5fa7f3150 (diff) | |
| download | FreeBSD-src-cc43c81b039ea4e8f8aec917d7a7cb781e320310.zip FreeBSD-src-cc43c81b039ea4e8f8aec917d7a7cb781e320310.tar.gz | |
MFC r258625: sdt: add support for solaris/illumos style DTRACE_PROBE macros
Note: in head KDTRACE_HOOKS is defined in opt_global.h and thus there is
no need to explicitly include any header to check that option.
In this branch we have to include opt_kdtrace.h and, so, this commit
carries additional changes to accomodate for that difference.
Sponsored by: HybridCluster
Diffstat (limited to 'sys/cddl/compat')
| -rw-r--r-- | sys/cddl/compat/opensolaris/sys/sdt.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/sys/cddl/compat/opensolaris/sys/sdt.h b/sys/cddl/compat/opensolaris/sys/sdt.h index 46b5b22..f03f6ab 100644 --- a/sys/cddl/compat/opensolaris/sys/sdt.h +++ b/sys/cddl/compat/opensolaris/sys/sdt.h @@ -29,20 +29,11 @@ #ifndef _OPENSOLARIS_SYS_SDT_H_ #define _OPENSOLARIS_SYS_SDT_H_ +#ifdef _KERNEL +#include <opt_kdtrace.h> +#endif #include_next <sys/sdt.h> -#undef DTRACE_PROBE -#undef DTRACE_PROBE1 -#undef DTRACE_PROBE2 -#undef DTRACE_PROBE3 -#undef DTRACE_PROBE4 - -#define DTRACE_PROBE(name) -#define DTRACE_PROBE1(name, type1, arg1) -#define DTRACE_PROBE2(name, type1, arg1, type2, arg2) -#define DTRACE_PROBE3(name, type1, arg1, type2, arg2, type3, arg3) -#define DTRACE_PROBE4(name, type1, arg1, type2, arg2, type3, arg3, type4, arg4) - #define SET_ERROR(err) (err) #endif /* _OPENSOLARIS_SYS_SDT_H_ */ |
