From 5b9aca3f0308bd8cdfbc3972f02092b078619770 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 3 Nov 2021 14:28:56 +0000 Subject: [PATCH] scst: Port to Linux kernel v5.15 git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9591 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_lib.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index 62997f980..444ca46ef 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -8249,7 +8249,8 @@ static struct request *blk_make_request(struct request_queue *q, if (IS_ERR(rq)) return rq; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) || \ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) || \ defined(CONFIG_SUSE_KERNEL) scsi_req_init(scsi_req(rq)); #else @@ -8480,7 +8481,8 @@ static struct request *blk_map_kern_sg(struct request_queue *q, if (unlikely(!rq)) return ERR_PTR(-ENOMEM); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) || \ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) || \ defined(CONFIG_SUSE_KERNEL) scsi_req_init(scsi_req(rq)); #else