Branch HEAD

Fix build problem for vendor kernels that have back-ported lockdep.

diff --git a/libcfs/include/libcfs/linux/linux-lock.h b/libcfs/include/libcfs/linux/linux-lock.h
index 474132b..2f7ba36 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-lock.h
+++ b/libcfs/include/libcfs/linux/linux-lock.h
@@ -145,7 +145,7 @@ static inline int mutex_is_locked(struct mutex *lock)
 }
 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16) */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+#ifndef lockdep_set_class
 
 /**************************************************************************
  *