X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-kernel-version.h;h=f98a1925e9419bfa6365743d49ecf6a748d7b306;hb=54f9f68d26153dad8813721793b7211c82216efb;hp=e8353fd4724e1a86220dfd70d9be9d2dc7c91459;hpb=3ad00dfcac0f81fc1296872968f5877402b7faf8;p=lttng-modules.git

diff --git a/lttng-kernel-version.h b/lttng-kernel-version.h
index e8353fd4..f98a1925 100644
--- a/lttng-kernel-version.h
+++ b/lttng-kernel-version.h
@@ -24,7 +24,12 @@
  */
 
 #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
@@ -35,17 +40,54 @@
 	 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))
+	(((a) << 24) + ((b) << 16) + ((c) << 8) + (d))
 
+#ifdef UTS_UBUNTU_RELEASE_ABI
 #define LTTNG_UBUNTU_VERSION_CODE \
 	((LINUX_VERSION_CODE << 8) + UTS_UBUNTU_RELEASE_ABI)
+#else
+#define LTTNG_UBUNTU_VERSION_CODE 	0
+#endif
 
 #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_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))
+
+#ifdef DEBIAN_API_VERSION
+#define LTTNG_DEBIAN_VERSION_CODE \
+	((LINUX_VERSION_CODE * 1000000ULL) + DEBIAN_API_VERSION)
+#else
+#define LTTNG_DEBIAN_VERSION_CODE	0
+#endif
+
+#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) \
+	(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))
+
+#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 */