X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-kernel-version.h;h=59e19df55ff775a82eeaf747b1590555ab31c5be;hb=18187357e1c6b2d73b913527b96be25f4bac97c8;hp=280a398a93e370db16f95b416802fb0ef0946213;hpb=5fa38800d965d5fa35a2c0c9a93e330711ec87e0;p=lttng-modules.git

diff --git a/lttng-kernel-version.h b/lttng-kernel-version.h
index 280a398a..59e19df5 100644
--- a/lttng-kernel-version.h
+++ b/lttng-kernel-version.h
@@ -25,12 +25,46 @@
 
 #include <linux/version.h>
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#include <generated/utsrelease.h>
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) */
+#include <linux/utsrelease.h>
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) */
+
 /*
  * 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_DEBIAN_KERNEL_VERSION(a, b, c, d, e, f) \
+	(((((a) << 16) + ((b) << 8) + (c)) * 1000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
+
+#define LTTNG_DEBIAN_VERSION_CODE \
+	((LINUX_VERSION_CODE * 1000000ULL) + DEBIAN_API_VERSION)
+
+#define LTTNG_DEBIAN_KERNEL_RANGE(a_low, b_low, c_low, d_low, e_low, f_low, \
+		a_high, b_high, c_high, d_high, e_high, f_high) \
+	(defined(DEBIAN_API_VERSION) && \
+		LTTNG_DEBIAN_VERSION_CODE >= \
+		LTTNG_DEBIAN_KERNEL_VERSION(a_low, b_low, c_low, d_low, e_low, f_low) && \
+		LTTNG_DEBIAN_VERSION_CODE < \
+		LTTNG_DEBIAN_KERNEL_VERSION(a_high, b_high, c_high, d_high, e_high, f_high))
 
 #endif /* _LTTNG_KERNEL_VERSION_H */