- unland b_fid to HEAD

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

diff --git a/lustre/portals/include/linux/libcfs.h b/lustre/portals/include/linux/libcfs.h
index 17d5a11..d1a5c44 100644 (file)
--- a/lustre/portals/include/linux/libcfs.h
+++ b/lustre/portals/include/linux/libcfs.h
@@ -145,13 +145,6 @@ 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__