diff options
| author | Brian Behlendorf <[email protected]> | 2012-11-06 14:49:11 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2012-11-06 14:49:14 -0800 |
| commit | 65c2fc5a2ed3a60711cc63e53b3ab01e9d5095ae (patch) | |
| tree | d2ba5295b19f9942ecf1f66d7e35d494fd23c722 /include | |
| parent | 87efc30b270454a372e18f236491b4f0e5bcc30d (diff) | |
| parent | 1112486356252d4bd1f9d62b3931314e7dc05a32 (diff) | |
Merge branch 'splat'
Additional debugging, some cleanup, and an assortment of fixes
to the SPLAT tests and infrastructure. Full details in the
individual patches.
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sys/condvar.h | 3 | ||||
| -rw-r--r-- | include/sys/kmem.h | 1 | ||||
| -rw-r--r-- | include/sys/types.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/include/sys/condvar.h b/include/sys/condvar.h index 59407c2dd..709a86d39 100644 --- a/include/sys/condvar.h +++ b/include/sys/condvar.h @@ -35,12 +35,13 @@ * calling any of the wait/signal funs, and passed into the wait funs. */ #define CV_MAGIC 0x346545f4 -#define CV_POISON 0x95 +#define CV_DESTROY 0x346545f5 typedef struct { int cv_magic; wait_queue_head_t cv_event; wait_queue_head_t cv_destroy; + atomic_t cv_refs; atomic_t cv_waiters; kmutex_t *cv_mutex; } kcondvar_t; diff --git a/include/sys/kmem.h b/include/sys/kmem.h index 0149e754c..e71a443a0 100644 --- a/include/sys/kmem.h +++ b/include/sys/kmem.h @@ -28,7 +28,6 @@ #include <linux/module.h> #include <linux/slab.h> #include <linux/vmalloc.h> -#include <linux/mm_compat.h> #include <linux/spinlock.h> #include <linux/rwsem.h> #include <linux/hash.h> diff --git a/include/sys/types.h b/include/sys/types.h index 0c3d88ec3..35905eb97 100644 --- a/include/sys/types.h +++ b/include/sys/types.h @@ -42,6 +42,8 @@ #include <linux/proc_compat.h> #include <linux/math64_compat.h> #include <linux/zlib_compat.h> +#include <linux/mm_compat.h> +#include <linux/delay.h> #ifndef HAVE_UINTPTR_T typedef unsigned long uintptr_t; |