X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=include%2Fsys%2Fzfs_context.h;h=a0165bb2f0ee5d163fcb2f01b46c6bbae8660c39;hb=321a498b95f4a43a5553f53b435497f89fefc599;hp=115bf9759f5ea53b1c96f529fe08395c58f9c0e4;hpb=6283f55ea1b91e680386388c17d14b89e344fa8d;p=zfs.git

diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h
index 115bf97..a0165bb 100644
--- a/include/sys/zfs_context.h
+++ b/include/sys/zfs_context.h
@@ -26,7 +26,7 @@
 #ifndef _SYS_ZFS_CONTEXT_H
 #define	_SYS_ZFS_CONTEXT_H
 
-#ifdef _KERNEL
+#ifdef __KERNEL__
 
 #include <sys/note.h>
 #include <sys/types.h>
@@ -49,15 +49,15 @@
 #include <sys/byteorder.h>
 #include <sys/systm.h>
 #include <sys/list.h>
-#include <sys/uio.h>
+#include <sys/uio_impl.h>
 #include <sys/dirent.h>
 #include <sys/time.h>
 #include <vm/seg_kmem.h>
 #include <sys/zone.h>
-#include <sys/uio.h>
 #include <sys/zfs_debug.h>
 #include <sys/fm/fs/zfs.h>
 #include <sys/sunddi.h>
+#include <linux/dcache_compat.h>
 
 #else /* _KERNEL */
 
@@ -310,6 +310,7 @@ 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);
 
 /*
  * kstat creation, installation and deletion