From a0cc1707a1e8cd960ccf9e4a5cd433e9edfd0213 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 3 Sep 2014 10:23:51 +0000 Subject: [PATCH] scst: Build fix for hex_to_bin() for RHEL 6.1 and later Reported-by: Yan Burman git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5751 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/scst.h | 3 ++- scst/src/scst_lib.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scst/include/scst.h b/scst/include/scst.h index 7e853dd64..99a1d2b7b 100644 --- a/scst/include/scst.h +++ b/scst/include/scst.h @@ -242,7 +242,8 @@ static inline unsigned int queue_max_hw_sectors(struct request_queue *q) #endif #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \ + (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 <= 6 && RHEL_MINOR -0 < 1) extern int hex_to_bin(char ch); #endif diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index fdeea4c90..b1be8e17c 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -100,7 +100,8 @@ char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap) } #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \ + (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 <= 6 && RHEL_MINOR -0 < 1) /* * See also "lib: introduce common method to convert hex digits" (commit * 903788892ea0fc7fcaf7e8e5fac9a77379fc215b).