From 93bf62fcb450b0bfaced519013470d9d92f0f2f2 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Mon, 25 May 2015 12:53:15 +0300 Subject: [PATCH] compat: PTR_RET is backported in RHEL6.7 Signed-off-by: Vladimir Sokolovsky --- include/linux/compat-2.6.39.h | 2 ++ 1 file changed, 2 insertions(+) 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 -- 2.41.0