mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-17 10:41:26 +00:00
Joined a few preprocessor statements on a single line that were split
over multiple lines such that scripts/generate-kernel-patch and scripts/run-regression-tests can process these. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1041 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
@@ -2792,8 +2792,7 @@ out:
|
||||
return;
|
||||
}
|
||||
|
||||
#if !((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) && \
|
||||
defined(SCSI_EXEC_REQ_FIFO_DEFINED))
|
||||
#if !((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) && defined(SCSI_EXEC_REQ_FIFO_DEFINED))
|
||||
|
||||
/*
|
||||
* Can switch to the next dst_sg element, so, to copy to strictly only
|
||||
@@ -2923,12 +2922,9 @@ out:
|
||||
return res;
|
||||
}
|
||||
|
||||
#endif /* !((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) && \
|
||||
defined(SCSI_EXEC_REQ_FIFO_DEFINED)) */
|
||||
#endif /* !((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) && defined(SCSI_EXEC_REQ_FIFO_DEFINED)) */
|
||||
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) && \
|
||||
!((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) && \
|
||||
defined(SCSI_EXEC_REQ_FIFO_DEFINED))
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) && !((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) && defined(SCSI_EXEC_REQ_FIFO_DEFINED))
|
||||
|
||||
#include <linux/pfn.h>
|
||||
|
||||
@@ -3314,9 +3310,7 @@ static void blk_rq_unmap_kern_sg(struct request *rq, int err)
|
||||
return;
|
||||
}
|
||||
|
||||
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) && \
|
||||
!(LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) && \
|
||||
defined(SCSI_EXEC_REQ_FIFO_DEFINED)) */
|
||||
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) && !(LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) && defined(SCSI_EXEC_REQ_FIFO_DEFINED)) */
|
||||
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user