scst: Refine r5751, the hex_to_bin() build fix for RHEL >= 6.1

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5753 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2014-09-03 10:50:52 +00:00
parent ad45c75be5
commit 811ff0f5a9
2 changed files with 6 additions and 4 deletions

View File

@@ -242,8 +242,9 @@ static inline unsigned int queue_max_hw_sectors(struct request_queue *q)
#endif
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 <= 6 && RHEL_MINOR -0 < 1)
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 6 || \
RHEL_MAJOR -0 == 6 && RHEL_MINOR -0 < 1)
extern int hex_to_bin(char ch);
#endif

View File

@@ -100,8 +100,9 @@ char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap)
}
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 <= 6 && RHEL_MINOR -0 < 1)
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 6 || \
RHEL_MAJOR -0 == 6 && RHEL_MINOR -0 < 1)
/*
* See also "lib: introduce common method to convert hex digits" (commit
* 903788892ea0fc7fcaf7e8e5fac9a77379fc215b).