compat: PTR_RET is backported in RHEL6.7

[~emulex/for-vlad/old/compat.git] / include / linux / compat-2.6.39.h

diff --git a/include/linux/compat-2.6.39.h b/include/linux/compat-2.6.39.h
index 56ebea4..7c913d4 100644 (file)
--- a/include/linux/compat-2.6.39.h
+++ b/include/linux/compat-2.6.39.h
@@ -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