From 019489a774123cef96805de8ccdcfc75797d0469 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Fri, 20 May 2011 11:13:07 +0000 Subject: [PATCH] Made it possible for generate-kernel-patch to evaluate all LINUX_VERSION_CODE statements. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3464 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst_local/scst_local.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scst_local/scst_local.c b/scst_local/scst_local.c index 49556e604..e5d5ac310 100644 --- a/scst_local/scst_local.c +++ b/scst_local/scst_local.c @@ -917,8 +917,8 @@ static int scst_local_send_resp(struct scsi_cmnd *cmnd, * This does the heavy lifting ... we pass all the commands on to the * target driver and have it do its magic ... */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) && \ - defined(CONFIG_SCST_LOCAL_FORCE_DIRECT_PROCESSING) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) +#ifdef CONFIG_SCST_LOCAL_FORCE_DIRECT_PROCESSING static int scst_local_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *SCpnt) #else @@ -927,6 +927,12 @@ static int scst_local_queuecommand_lck(struct scsi_cmnd *SCpnt, __acquires(&h->host_lock) __releases(&h->host_lock) #endif +#else +static int scst_local_queuecommand_lck(struct scsi_cmnd *SCpnt, + void (*done)(struct scsi_cmnd *)) + __acquires(&h->host_lock) + __releases(&h->host_lock) +#endif { #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)) struct scst_local_tgt_specific *tgt_specific = NULL;