]> git.openfabrics.org - compat-rdma/compat.git/commitdiff
compat: PTR_RET is backported in RHEL6.7
authorVladimir Sokolovsky <vlad@mellanox.com>
Mon, 25 May 2015 09:53:15 +0000 (12:53 +0300)
committerVladimir Sokolovsky <vlad@mellanox.com>
Mon, 25 May 2015 11:45:57 +0000 (14:45 +0300)
Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
include/linux/compat-2.6.39.h

index 56ebea44353a9d60cf730e4ac78dddfff71d594b..7c913d4059e15221571184332a3f0c07da2c3bac 100644 (file)
@@ -193,6 +193,7 @@ static inline void __clear_bit_le(int nr, void *addr)
 #endif
 
 #ifndef __ASSEMBLY__
+#ifndef PTR_RET
 #define PTR_RET LINUX_BACKPORT(PTR_RET)
 static inline int __must_check PTR_RET(const void *ptr)
 {
@@ -202,6 +203,7 @@ static inline int __must_check PTR_RET(const void *ptr)
                return 0;
 }
 #endif
+#endif
 
 #ifndef IEEE_8021QAZ_TSA_STRICT
 #define IEEE_8021QAZ_TSA_STRICT         0