LU-663 kernel: Some arch do not have NUMA features anymore

[fs/lustre-release.git] / libcfs / include / libcfs / user-lock.h

diff --git a/libcfs/include/libcfs/user-lock.h b/libcfs/include/libcfs/user-lock.h
index ca6656f..8c70f05 100644 (file)
--- a/libcfs/include/libcfs/user-lock.h
+++ b/libcfs/include/libcfs/user-lock.h
@@ -236,7 +236,7 @@ typedef struct { volatile int counter; } cfs_atomic_t;
         ((v)->counter != u ? (v)->counter += a : 0)
 #define cfs_atomic_inc_not_zero(v) cfs_atomic_add_unless((v), 1, 0)
 
-#ifdef HAVE_PTHREAD
+#ifdef HAVE_LIBPTHREAD
 #include <pthread.h>
 
 /*
@@ -268,7 +268,7 @@ void cfs_mt_atomic_dec(cfs_mt_atomic_t *a);
 void cfs_mt_atomic_add(int b, cfs_mt_atomic_t *a);
 void cfs_mt_atomic_sub(int b, cfs_mt_atomic_t *a);
 
-#endif /* HAVE_PTHREAD */
+#endif /* HAVE_LIBPTHREAD */
 
 /**************************************************************************
  *
@@ -282,6 +282,8 @@ void cfs_mt_atomic_sub(int b, cfs_mt_atomic_t *a);
 #define cfs_up(s)                           cfs_mutex_up(s)
 #define cfs_mutex_down(s)                   __down(s)
 #define cfs_down(s)                         cfs_mutex_down(s)
+#define cfs_mutex_down_interruptible(s)     __down_interruptible(s)
+#define cfs_down_interruptible(s)           cfs_mutex_down_interruptible(s)
 
 #define cfs_init_mutex(x)                   cfs_sema_init(x, 1)
 #define cfs_init_mutex_locked(x)            cfs_sema_init(x, 0)