diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2007-02-03 11:28:17 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2007-02-03 11:28:17 +0000 |
| commit | 47910d7b8af40ffaccc8845d10d109871b5be604 (patch) | |
| tree | c44982666a67e1d892bb5a3d69cf9643b65f44c8 /kernel/fuse_i.h | |
| parent | 6e7d018049193efe9d092bb91c4416a332f28278 (diff) | |
| download | libfuse-47910d7b8af40ffaccc8845d10d109871b5be604.tar.gz | |
merge to fuse_2_6_merge2
Diffstat (limited to 'kernel/fuse_i.h')
| -rw-r--r-- | kernel/fuse_i.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h index 5259ee1..f4e2ece 100644 --- a/kernel/fuse_i.h +++ b/kernel/fuse_i.h @@ -42,7 +42,7 @@ # define KERNEL_2_6_19_PLUS #endif -#ifdef __arm__ +#if defined(__arm__) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) #define DCACHE_BUG #endif @@ -55,13 +55,18 @@ #include <linux/spinlock.h> #include <linux/mm.h> #include <linux/backing-dev.h> -#ifndef DEFINE_MUTEX +#ifdef HAVE_MUTEX_H +#include <linux/mutex.h> +#else +#include <asm/semaphore.h> #define DEFINE_MUTEX(m) DECLARE_MUTEX(m) #define mutex_init(m) init_MUTEX(m) #define mutex_destroy(m) do { } while (0) #define mutex_lock(m) down(m) #define mutex_unlock(m) up(m) #define mutex semaphore +#endif +#ifndef HAVE_I_MUTEX #define i_mutex i_sem /* Hack for struct inode */ #endif #ifndef KERNEL_2_6_19_PLUS |