blob: 9248ffe4ffa35ff06645367cb75d4b530457ed37 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
From 868e0b6db59159197c2cec3550fa4ad5e6572bc5 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 4 Apr 2022 13:54:59 -0400
Subject: [PATCH 04/10] fix: block: remove genhd.h (v5.18)
See upstream commit :
commit 322cbb50de711814c42fb088f6d31901502c711a
Author: Christoph Hellwig <hch@lst.de>
Date: Mon Jan 24 10:39:13 2022 +0100
block: remove genhd.h
There is no good reason to keep genhd.h separate from the main blkdev.h
header that includes it. So fold the contents of genhd.h into blkdev.h
and remove genhd.h entirely.
Upstream-Status: Backport
Change-Id: I7cf2aaa3a4c133320b95f2edde49f790f9515dbd
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
include/wrapper/genhd.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/wrapper/genhd.h b/include/wrapper/genhd.h
index 3c6dbcbe..4a59b68e 100644
--- a/include/wrapper/genhd.h
+++ b/include/wrapper/genhd.h
@@ -12,7 +12,11 @@
#ifndef _LTTNG_WRAPPER_GENHD_H
#define _LTTNG_WRAPPER_GENHD_H
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0))
+#include <linux/blkdev.h>
+#else
#include <linux/genhd.h>
+#endif
#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0))
#define LTTNG_GENHD_FL_HIDDEN GENHD_FL_HIDDEN
--
2.19.1
|
