From: Kienan Stewart <kstewart@efficios.com>
Date: Fri, 24 Jan 2025 19:47:09 +0000 (+0000)
Subject: Fix: genhd.h removed in SLE15 SP5
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=f675217980dcf7128c8f31dc631f8bc82b645a69;p=lttng-modules.git

Fix: genhd.h removed in SLE15 SP5

See upstream SUSE commit:

    commit f9d378fde421f331e9f1f18f3b2cbdaf9fcd0a1a
    Author: Hannes Reinecke <hare@suse.de>
    Date:   Sat Nov 26 13:51:49 2022 +0100

        - block: remove genhd.h (jsc#PED-1183).
        - Refresh
          patches.suse/0006-nvdimm-blk-Delete-the-block-aperture-window-driver.patch.
        - Refresh
          patches.suse/0007-PM-hibernate-encrypt-hidden-area.patch.
        - Refresh patches.suse/target-add-rbd-backend.patch.

        suse-commit: dd0982ae4edd5e7142e6ed1676269d54ac51d7df

Change-Id: I4b2092fc4547d2515724a6065e4656eb33994c00
Signed-off-by: Kienan Stewart <kstewart@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/include/wrapper/blkdev.h b/include/wrapper/blkdev.h
index 76397f6b..8e5a0860 100644
--- a/include/wrapper/blkdev.h
+++ b/include/wrapper/blkdev.h
@@ -13,14 +13,16 @@
 #define _LTTNG_WRAPPER_BLKDEV_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))
+	|| LTTNG_RHEL_KERNEL_RANGE(5,14,0,162,0,0, 5,15,0,0,0,0) \
+	|| LTTNG_SLE_VERSION_CODE >= LTTNG_SLE_VERSION(150500, 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))
+	|| LTTNG_RHEL_KERNEL_RANGE(5,14,0,162,0,0, 5,15,0,0,0,0) \
+	|| LTTNG_SLE_VERSION_CODE >= LTTNG_SLE_VERSION(150500, 0, 0))
 #define LTTNG_GENHD_FL_HIDDEN GENHD_FL_HIDDEN
 #else
 #define LTTNG_GENHD_FL_HIDDEN GENHD_FL_SUPPRESS_PARTITION_INFO