Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-9118 o2iblnd: handle MOFED libcfs time api collision
[fs/lustre-release.git]
/
libcfs
/
include
/
libcfs
/
linux
/
linux-time.h
diff --git
a/libcfs/include/libcfs/linux/linux-time.h
b/libcfs/include/libcfs/linux/linux-time.h
index
bf403ff
..
6c1004d
100644
(file)
--- a/
libcfs/include/libcfs/linux/linux-time.h
+++ b/
libcfs/include/libcfs/linux/linux-time.h
@@
-145,12
+145,12
@@
time64_t ktime_get_real_seconds(void);
time64_t ktime_get_seconds(void);
#endif /* HAVE_KTIME_GET_SECONDS */
time64_t ktime_get_seconds(void);
#endif /* HAVE_KTIME_GET_SECONDS */
-#if
ndef HAVE
_KTIME_GET_REAL_NS
+#if
def NEED
_KTIME_GET_REAL_NS
static inline u64 ktime_get_real_ns(void)
{
return ktime_to_ns(ktime_get_real());
}
static inline u64 ktime_get_real_ns(void)
{
return ktime_to_ns(ktime_get_real());
}
-#endif /*
HAVE_KTIME_GET
_NS */
+#endif /*
NEED_KTIME_GET_REAL
_NS */
static inline int cfs_time_before(cfs_time_t t1, cfs_time_t t2)
{
static inline int cfs_time_before(cfs_time_t t1, cfs_time_t t2)
{