| From e8d2f286b5b208ac8870d0a9c167b170e96169b3 Mon Sep 17 00:00:00 2001 |
| From: Michael Jeanson <mjeanson@efficios.com> |
| Date: Mon, 4 Apr 2022 15:08:48 -0400 |
| Subject: [PATCH 08/10] fix: scsi: core: Remove <scsi/scsi_request.h> (v5.18) |
| |
| See upstream commit : |
| |
| commit 26440303310591e29121964ede0048583cb3126d |
| Author: Christoph Hellwig <hch@lst.de> |
| Date: Thu Feb 24 18:55:52 2022 +0100 |
| |
| scsi: core: Remove <scsi/scsi_request.h> |
| |
| This header is empty now except for an include of <linux/blk-mq.h>, so |
| remove it. |
| |
| Upstream-Status: Backport |
| |
| Change-Id: Ic8ee3352f1e8bddfcd44c31be9b788db82f183aa |
| Signed-off-by: Michael Jeanson <mjeanson@efficios.com> |
| Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> |
| --- |
| include/instrumentation/events/block.h | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/include/instrumentation/events/block.h b/include/instrumentation/events/block.h |
| index 050a59a2..882e6e08 100644 |
| --- a/include/instrumentation/events/block.h |
| +++ b/include/instrumentation/events/block.h |
| @@ -11,9 +11,9 @@ |
| #include <linux/trace_seq.h> |
| #include <lttng/kernel-version.h> |
| |
| -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) |
| +#if LTTNG_KERNEL_RANGE(4,11,0, 5,18,0) |
| #include <scsi/scsi_request.h> |
| -#endif /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,11,0)) */ |
| +#endif /* LTTNG_KERNEL_RANGE(4,11,0, 5,18,0) */ |
| |
| #ifndef _TRACE_BLOCK_DEF_ |
| #define _TRACE_BLOCK_DEF_ |
| -- |
| 2.19.1 |
| |