X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=include%2Fsys%2Fzfs_context.h;h=a32848941557b40dd0b1b46cdd6bf1ac6286bb57;hb=adcd70bd1af405464d6dbc6b2057594cddda7a24;hp=a0165bb2f0ee5d163fcb2f01b46c6bbae8660c39;hpb=8299a1f41eb4761cd25ea821830295a6f32be581;p=zfs.git

diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h
index a0165bb..a328489 100644
--- a/include/sys/zfs_context.h
+++ b/include/sys/zfs_context.h
@@ -310,7 +310,8 @@ extern void cv_wait(kcondvar_t *cv, kmutex_t *mp);
 extern clock_t cv_timedwait(kcondvar_t *cv, kmutex_t *mp, clock_t abstime);
 extern void cv_signal(kcondvar_t *cv);
 extern void cv_broadcast(kcondvar_t *cv);
-#define cv_timedwait_interruptible(cv, mp, at)	cv_timedwait(cv, mp, at);
+#define cv_timedwait_interruptible(cv, mp, at)	cv_timedwait(cv, mp, at)
+#define cv_wait_interruptible(cv, mp)		cv_wait(cv, mp)
 
 /*
  * kstat creation, installation and deletion
@@ -328,6 +329,8 @@ extern void kstat_delete(kstat_t *);
 #define	KM_NOSLEEP		UMEM_DEFAULT
 #define	KM_NODEBUG		0x0
 #define	KMC_NODEBUG		UMC_NODEBUG
+#define	KMC_KMEM		0x0
+#define	KMC_VMEM		0x0
 #define	kmem_alloc(_s, _f)	umem_alloc(_s, _f)
 #define	kmem_zalloc(_s, _f)	umem_zalloc(_s, _f)
 #define	kmem_free(_b, _s)	umem_free(_b, _s)
@@ -367,6 +370,7 @@ typedef void (task_func_t)(void *);
 #define	TASKQ_DYNAMIC		0x0004	/* Use dynamic thread scheduling */
 #define	TASKQ_THREADS_CPU_PCT	0x0008	/* Scale # threads by # cpus */
 #define	TASKQ_DC_BATCH		0x0010	/* Mark threads as batch */
+#define	TASKQ_NORECLAIM		0x0020	/* Disable direct memory reclaim */
 
 #define	TQ_SLEEP	KM_SLEEP	/* Can block for memory */
 #define	TQ_NOSLEEP	KM_NOSLEEP	/* cannot block for memory; may fail */