From: Vladimir Sokolovsky <vlad@mellanox.com>
Date: Mon, 25 May 2015 09:53:15 +0000 (+0300)
Subject: compat: PTR_RET is backported in RHEL6.7
X-Git-Tag: vofed-3.18~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=93bf62fcb450b0bfaced519013470d9d92f0f2f2;p=~emulex%2Ffor-vlad%2Fcompat.git

compat: PTR_RET is backported in RHEL6.7

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---

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