Merge commit 'refs/top-bases/linux-arc' into linux-arc

lib/libzpool/include/sys/zfs_context.h

@@ -168,6 +168,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)
@@ -450,6 +455,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);