- landing of b_fid after merge with b_hd_cleanup_merge.

[fs/lustre-release.git] / lnet / include / linux / libcfs.h

diff --git a/lnet/include/linux/libcfs.h b/lnet/include/linux/libcfs.h
index d1a5c44..17d5a11 100644 (file)
--- a/lnet/include/linux/libcfs.h
+++ b/lnet/include/linux/libcfs.h
@@ -145,6 +145,13 @@ struct ptldebug_header {
 # endif
 #endif
 
+#ifndef likely
+# define likely(exp) (exp)
+#endif
+#ifndef unlikely
+# define unlikely(exp) (exp)
+#endif
+
 #define LUSTRE_TRACE_SIZE (THREAD_SIZE >> 5)
 
 #ifdef __KERNEL__