X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=inline;f=libcfs%2Finclude%2Flibcfs%2Flibcfs.h;h=bedc82fc48310b6d1206603ff37feadc4654b884;hb=6e3ec5812ebd1b5ecf7cae584f429b013ffe7431;hp=6ba53d340ec7d2e2dc819f081e26b71f9e73708f;hpb=0b5b209ffbd457e533e1b956c9268eb5bed8e604;p=fs%2Flustre-release.git

diff --git a/libcfs/include/libcfs/libcfs.h b/libcfs/include/libcfs/libcfs.h
index 6ba53d3..bedc82f 100644
--- a/libcfs/include/libcfs/libcfs.h
+++ b/libcfs/include/libcfs/libcfs.h
@@ -103,14 +103,8 @@ static inline int __is_po2(unsigned long long val)
 
 #include <libcfs/list.h>
 
-/* for_each_possible_cpu is defined newly, the former is
- * for_each_cpu(eg. sles9 and sles10) b=15878 */
-#ifndef for_each_possible_cpu
-# ifdef for_each_cpu
-#  define for_each_possible_cpu(cpu) for_each_cpu(cpu)
-# else
-#  error for_each_possible_cpu is not supported by kernel!
-# endif
+#ifndef cfs_for_each_possible_cpu
+#  error cfs_for_each_possible_cpu is not supported by kernel!
 #endif
 
 /* libcfs tcpip */
@@ -141,7 +135,7 @@ struct lc_watchdog *lc_watchdog_add(int time,
 
 /* Enables a watchdog and resets its timer. */
 void lc_watchdog_touch(struct lc_watchdog *lcw, int timeout);
-#define GET_TIMEOUT(svc) (max_t(int, obd_timeout,                       \
+#define CFS_GET_TIMEOUT(svc) (max_t(int, obd_timeout,                   \
                           AT_OFF ? 0 : at_get(&svc->srv_at_estimate)) * \
                           svc->srv_watchdog_factor)