aboutsummaryrefslogtreecommitdiff
path: root/sys/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys/sys')
-rw-r--r--sys/sys/lockstat.h14
-rw-r--r--sys/sys/sdt.h1
2 files changed, 9 insertions, 6 deletions
diff --git a/sys/sys/lockstat.h b/sys/sys/lockstat.h
index 958e9503185e..6183bc7c9150 100644
--- a/sys/sys/lockstat.h
+++ b/sys/sys/lockstat.h
@@ -107,10 +107,6 @@ extern int lockstat_enabled;
LOCKSTAT_RECORD1(probe, lp, a); \
} while (0)
-#ifndef LOCK_PROFILING
-#define LOCKSTAT_PROFILE_ENABLED(probe) SDT_PROBE_ENABLED(lockstat, , , probe)
-#endif
-
struct lock_object;
uint64_t lockstat_nsecs(struct lock_object *);
@@ -134,10 +130,16 @@ uint64_t lockstat_nsecs(struct lock_object *);
#define LOCKSTAT_PROFILE_RELEASE_RWLOCK(probe, lp, a) \
LOCKSTAT_PROFILE_RELEASE_LOCK(probe, lp)
+#endif /* !KDTRACE_HOOKS */
+
#ifndef LOCK_PROFILING
-#define LOCKSTAT_PROFILE_ENABLED(probe) 0
+#define LOCKSTAT_PROFILE_ENABLED(probe) \
+ SDT_PROBE_ENABLED(lockstat, , , probe)
+#define LOCKSTAT_OOL_PROFILE_ENABLED(probe) \
+ SDT_PROBE_ENABLED(lockstat, , , probe)
+#else
+#define LOCKSTAT_OOL_PROFILE_ENABLED(probe) 1
#endif
-#endif /* !KDTRACE_HOOKS */
#endif /* _KERNEL */
#endif /* _SYS_LOCKSTAT_H */
diff --git a/sys/sys/sdt.h b/sys/sys/sdt.h
index 42598837fd72..c680ea85718a 100644
--- a/sys/sys/sdt.h
+++ b/sys/sys/sdt.h
@@ -86,6 +86,7 @@
#define SDT_PROVIDER_DECLARE(prov)
#define SDT_PROBE_DEFINE(prov, mod, func, name)
#define SDT_PROBE_DECLARE(prov, mod, func, name)
+#define SDT_PROBE_ENABLED(prov, mod, func, name) 0
#define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)
#define SDT_PROBE_ARGTYPE(prov, mod, func, name, num, type, xtype)