UBUNTU: SAUCE: (noup) Update spl to 0.6.5.11-ubuntu1, zfs to 0.6.5.11-1ubuntu3

[mirror_ubuntu-artful-kernel.git] / spl / include / sys / condvar.h

diff --git a/spl/include/sys/condvar.h b/spl/include/sys/condvar.h
index efcf0dda2769b2c903636932bc0ca0f9b4da0c7d..8a4aab44b5ab04c74d195336397a03a8d42ad471 100644 (file)
--- a/spl/include/sys/condvar.h
+++ b/spl/include/sys/condvar.h
@@ -26,7 +26,7 @@
 #define        _SPL_CONDVAR_H
 
 #include <linux/module.h>
-#include <linux/wait.h>
+#include <linux/wait_compat.h>
 #include <linux/delay_compat.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
@@ -41,8 +41,8 @@
 
 typedef struct {
        int cv_magic;
-       wait_queue_head_t cv_event;
-       wait_queue_head_t cv_destroy;
+       spl_wait_queue_head_t cv_event;
+       spl_wait_queue_head_t cv_destroy;
        atomic_t cv_refs;
        atomic_t cv_waiters;
        kmutex_t *cv_mutex;