--- a/usr/src/lib/libzpool/common/sys/zfs_context.h Tue Sep 02 15:52:21 2008 -0600
+++ b/usr/src/lib/libzpool/common/sys/zfs_context.h Tue Sep 02 15:57:54 2008 -0600
@@ -26,8 +26,6 @@
#ifndef _SYS_ZFS_CONTEXT_H
#define _SYS_ZFS_CONTEXT_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -161,6 +159,11 @@
* existence for their counterparts in libzpool.
*/
+#ifdef DTRACE_PROBE
+#undef DTRACE_PROBE
+#define DTRACE_PROBE(a) ((void)0)
+#endif /* DTRACE_PROBE */
+
#ifdef DTRACE_PROBE1
#undef DTRACE_PROBE1
#define DTRACE_PROBE1(a, b, c) ((void)0)
@@ -442,6 +445,8 @@
#define kcred NULL
#define CRED() NULL
+#define ptob(x) ((x) * PAGESIZE)
+
extern uint64_t physmem;
extern int highbit(ulong_t i);