From d67f20abfbb4a3ecf2592f4815024ecf3ffb6764 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 24 Jul 2018 02:38:35 +0000 Subject: [PATCH] scst/include/backport.h: Unbreak the build for kernel version 2.6.30 and older git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7443 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/backport.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scst/include/backport.h b/scst/include/backport.h index 21344c67e..439344d39 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -100,11 +100,11 @@ static inline unsigned int queue_max_hw_sectors(struct request_queue *q) * Note: the function bsg_job_sense() exists only in SCST but not in any * upstream kernel. */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31) && \ - ((LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) && \ - !defined(CONFIG_SUSE_KERNEL)) || \ - (LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) && \ - defined(CONFIG_SUSE_KERNEL))) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31) +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) && \ + !defined(CONFIG_SUSE_KERNEL)) || \ + (LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) && \ + defined(CONFIG_SUSE_KERNEL)) static inline void *bsg_job_sense(struct fc_bsg_job *job) { return job->req->sense; @@ -121,6 +121,7 @@ static inline void *bsg_job_sense(struct bsg_job *job) #endif } #endif +#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31) */ /* */