From dbc567603dd05f49183d365440669465b565cc52 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 19 Dec 2008 09:39:17 -0800 Subject: [PATCH 1/3] Readd removed hunk --- lib/libzpool/include/sys/zfs_context.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libzpool/include/sys/zfs_context.h b/lib/libzpool/include/sys/zfs_context.h index f535abf4ee..8b5dff7306 100644 --- a/lib/libzpool/include/sys/zfs_context.h +++ b/lib/libzpool/include/sys/zfs_context.h @@ -162,6 +162,11 @@ _NOTE(CONSTCOND) } while (0) * 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) From 111303eeb80354d632d53c788b411b9e2940a568 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 19 Dec 2008 09:47:09 -0800 Subject: [PATCH 2/3] context --- lib/libzpool/include/sys/zfs_context.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libzpool/include/sys/zfs_context.h b/lib/libzpool/include/sys/zfs_context.h index 8b5dff7306..ad5f2f8de1 100644 --- a/lib/libzpool/include/sys/zfs_context.h +++ b/lib/libzpool/include/sys/zfs_context.h @@ -164,7 +164,7 @@ _NOTE(CONSTCOND) } while (0) #ifdef DTRACE_PROBE #undef DTRACE_PROBE -#define DTRACE_PROBE(a) ((void)0) +#define DTRACE_PROBE(a) ((void)0) #endif /* DTRACE_PROBE */ #ifdef DTRACE_PROBE1 From 3bc48c3e74270ff92bbb58c58d8808f8f21b0f0b Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 19 Dec 2008 09:50:15 -0800 Subject: [PATCH 3/3] Missing func readd --- lib/libzpool/include/sys/zfs_context.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libzpool/include/sys/zfs_context.h b/lib/libzpool/include/sys/zfs_context.h index ad5f2f8de1..f7999215a6 100644 --- a/lib/libzpool/include/sys/zfs_context.h +++ b/lib/libzpool/include/sys/zfs_context.h @@ -449,6 +449,8 @@ extern void delay(clock_t ticks); #define kcred NULL #define CRED() NULL +#define ptob(x) ((x) * PAGESIZE) + extern uint64_t physmem; extern int highbit(ulong_t i);