X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-kernel-version.h;h=62b82efce3b70c6d119574b0e80084d79e7c7066;hb=refs%2Fheads%2Fstable-2.5;hp=280a398a93e370db16f95b416802fb0ef0946213;hpb=5fa38800d965d5fa35a2c0c9a93e330711ec87e0;p=lttng-modules.git

diff --git a/lttng-kernel-version.h b/lttng-kernel-version.h
index 280a398a..62b82efc 100644
--- a/lttng-kernel-version.h
+++ b/lttng-kernel-version.h
@@ -24,13 +24,45 @@
  */
 
 #include <linux/version.h>
+#include <linux/vermagic.h>
 
 /*
  * This macro checks if the kernel version is between the two specified
- * versions (inclusive).
+ * versions (lower limit inclusive, upper limit exclusive).
  */
 #define LTTNG_KERNEL_RANGE(a_low, b_low, c_low, a_high, b_high, c_high) \
 	(LINUX_VERSION_CODE >= KERNEL_VERSION(a_low, b_low, c_low) && \
-	 LINUX_VERSION_CODE <= KERNEL_VERSION(a_high, b_high, c_high))
+	 LINUX_VERSION_CODE < KERNEL_VERSION(a_high, b_high, c_high))
+
+#define LTTNG_UBUNTU_KERNEL_VERSION(a, b, c, d) \
+	(((a) << 24) + ((b) << 16) + ((c) << 8) + (d))
+
+#define LTTNG_UBUNTU_VERSION_CODE \
+	((LINUX_VERSION_CODE << 8) + UTS_UBUNTU_RELEASE_ABI)
+
+#define LTTNG_UBUNTU_KERNEL_RANGE(a_low, b_low, c_low, d_low, \
+		a_high, b_high, c_high, d_high) \
+	(defined(UTS_UBUNTU_RELEASE_ABI) && \
+		LTTNG_UBUNTU_VERSION_CODE >= \
+		LTTNG_UBUNTU_KERNEL_VERSION(a_low, b_low, c_low, d_low) && \
+		LTTNG_UBUNTU_VERSION_CODE < \
+		LTTNG_UBUNTU_KERNEL_VERSION(a_high, b_high, c_high, d_high))
+
+#define LTTNG_RHEL_KERNEL_VERSION(a, b, c, d, e) \
+	(((a) * (1ULL << 32)) + ((b) << 24) + ((c) << 16) + ((d) << 8) + (e))
+
+#ifdef RHEL_RELEASE_CODE
+#define LTTNG_RHEL_VERSION_CODE \
+	((LINUX_VERSION_CODE * (1ULL << 16)) + RHEL_RELEASE_CODE)
+#else
+#define LTTNG_RHEL_VERSION_CODE		0
+#endif
+
+#define LTTNG_RHEL_KERNEL_RANGE(a_low, b_low, c_low, d_low, e_low, \
+		a_high, b_high, c_high, d_high, e_high) \
+	(LTTNG_RHEL_VERSION_CODE >= \
+		LTTNG_RHEL_KERNEL_VERSION(a_low, b_low, c_low, d_low, e_low) && \
+		LTTNG_RHEL_VERSION_CODE < \
+		LTTNG_RHEL_KERNEL_VERSION(a_high, b_high, c_high, d_high, e_high))
 
 #endif /* _LTTNG_KERNEL_VERSION_H */