X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=include%2Fsys%2Fzfs_context.h;h=a32848941557b40dd0b1b46cdd6bf1ac6286bb57;hb=f31b3ebe6e6c9de4db30bf752c09a8300b305258;hp=0ebacbc64b5315843675e89c96fd5eeb95b89cdf;hpb=590329b50cda53cad87a4222d55cdbb35bfcf494;p=zfs.git

diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h
index 0ebacbc..a328489 100644
--- a/include/sys/zfs_context.h
+++ b/include/sys/zfs_context.h
@@ -57,6 +57,7 @@
 #include <sys/zfs_debug.h>
 #include <sys/fm/fs/zfs.h>
 #include <sys/sunddi.h>
+#include <linux/dcache_compat.h>
 
 #else /* _KERNEL */
 
@@ -309,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
@@ -327,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)
@@ -366,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 */