X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=wrapper%2Fgenhd.h;h=cacf3275ca628acfa6f2bf5945c683e94a58b1ff;hb=edee4485348d15198bc76a4fb4ae2d27e9872364;hp=98feb57bebde635fb11781209ca2871a8faafa0c;hpb=60c64030e811165e62a62eb551459dd2416d6ec2;p=lttng-modules.git

diff --git a/wrapper/genhd.h b/wrapper/genhd.h
index 98feb57b..cacf3275 100644
--- a/wrapper/genhd.h
+++ b/wrapper/genhd.h
@@ -12,7 +12,19 @@
 #ifndef _LTTNG_WRAPPER_GENHD_H
 #define _LTTNG_WRAPPER_GENHD_H
 
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0) \
+	|| LTTNG_RHEL_KERNEL_RANGE(5,14,0,162,0,0, 5,15,0,0,0,0))
+#include <linux/blkdev.h>
+#else
 #include <linux/genhd.h>
+#endif
+
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0) \
+	|| LTTNG_RHEL_KERNEL_RANGE(5,14,0,162,0,0, 5,15,0,0,0,0))
+#define LTTNG_GENHD_FL_HIDDEN GENHD_FL_HIDDEN
+#else
+#define LTTNG_GENHD_FL_HIDDEN GENHD_FL_SUPPRESS_PARTITION_INFO
+#endif
 
 #ifdef CONFIG_KALLSYMS_ALL