X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-kernel-version.h;h=daf2c6adcb75ea9650d9c41c521f3083a7882377;hb=2d0428212cbfa3f8428feee160b095f48c2ac974;hp=26f816c0a6e75c1ecabcaf28f9e9d2d02a9f36ae;hpb=e0f2366419fc59700e575bab82a41255c51de2dc;p=lttng-modules.git

diff --git a/lttng-kernel-version.h b/lttng-kernel-version.h
index 26f816c0..daf2c6ad 100644
--- a/lttng-kernel-version.h
+++ b/lttng-kernel-version.h
@@ -13,22 +13,25 @@
 #include <linux/version.h>
 #include <generated/utsrelease.h>
 
+#define LTTNG_KERNEL_VERSION(a, b, c) KERNEL_VERSION(a, b, c)
+#define LTTNG_LINUX_VERSION_CODE LINUX_VERSION_CODE
+
 /*
  * This macro checks if the kernel version is between the two specified
  * 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))
+	(LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(a_low, b_low, c_low) && \
+	 LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(a_high, b_high, c_high))
 
 /* Ubuntu */
 
 #define LTTNG_UBUNTU_KERNEL_VERSION(a, b, c, d) \
-	(((a) << 24) + ((b) << 16) + ((c) << 8) + (d))
+	(((LTTNG_KERNEL_VERSION(a, b, c)) << 8) + (d))
 
 #ifdef UTS_UBUNTU_RELEASE_ABI
 #define LTTNG_UBUNTU_VERSION_CODE \
-	((LINUX_VERSION_CODE << 8) + UTS_UBUNTU_RELEASE_ABI)
+	((LTTNG_LINUX_VERSION_CODE << 8) + UTS_UBUNTU_RELEASE_ABI)
 #else
 #define LTTNG_UBUNTU_VERSION_CODE 	0
 #endif
@@ -43,11 +46,11 @@
 /* Debian */
 
 #define LTTNG_DEBIAN_KERNEL_VERSION(a, b, c, d, e, f) \
-	(((((a) << 16) + ((b) << 8) + (c)) * 1000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
+	(((LTTNG_KERNEL_VERSION(a, b, c)) * 1000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
 
 #ifdef DEBIAN_API_VERSION
 #define LTTNG_DEBIAN_VERSION_CODE \
-	((LINUX_VERSION_CODE * 1000000ULL) + DEBIAN_API_VERSION)
+	((LTTNG_LINUX_VERSION_CODE * 1000000ULL) + DEBIAN_API_VERSION)
 #else
 #define LTTNG_DEBIAN_VERSION_CODE	0
 #endif
@@ -60,13 +63,13 @@
 		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, f) \
-	(((((a) << 16) + ((b) << 8) + (c)) * 10000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
+	(((LTTNG_KERNEL_VERSION(a, b, c)) * 10000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
 
 /* RHEL */
 
 #ifdef RHEL_API_VERSION
 #define LTTNG_RHEL_VERSION_CODE \
-	((LINUX_VERSION_CODE * 10000000ULL) + RHEL_API_VERSION)
+	((LTTNG_LINUX_VERSION_CODE * 10000000ULL) + RHEL_API_VERSION)
 #else
 #define LTTNG_RHEL_VERSION_CODE		0
 #endif
@@ -81,11 +84,11 @@
 /* SUSE Linux enterprise */
 
 #define LTTNG_SLE_KERNEL_VERSION(a, b, c, d, e, f) \
-	(((((a) << 16) + ((b) << 8) + (c)) * 10000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
+	(((LTTNG_KERNEL_VERSION(a, b, c)) * 10000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
 
 #ifdef SLE_API_VERSION
 #define LTTNG_SLE_VERSION_CODE \
-	((LINUX_VERSION_CODE * 10000000ULL) + SLE_API_VERSION)
+	((LTTNG_LINUX_VERSION_CODE * 10000000ULL) + SLE_API_VERSION)
 #else
 #define LTTNG_SLE_VERSION_CODE 	0
 #endif
@@ -100,11 +103,11 @@
 /* Fedora */
 
 #define LTTNG_FEDORA_KERNEL_VERSION(a, b, c, d) \
-        (((((a) << 16) + ((b) << 8) + (c)) * 10000ULL) + (d))
+        (((LTTNG_KERNEL_VERSION(a, b, c)) * 10000ULL) + (d))
 
 #ifdef FEDORA_REVISION_VERSION
 #define LTTNG_FEDORA_VERSION_CODE \
-        ((LINUX_VERSION_CODE * 10000ULL) + FEDORA_REVISION_VERSION)
+        ((LTTNG_LINUX_VERSION_CODE * 10000ULL) + FEDORA_REVISION_VERSION)
 #else
 #define LTTNG_FEDORA_VERSION_CODE         0
 #endif
@@ -119,11 +122,11 @@
 /* RT patch */
 
 #define LTTNG_RT_KERNEL_VERSION(a, b, c, d) \
-	(((a) << 24) + ((b) << 16) + ((c) << 8) + (d))
+	(((LTTNG_KERNEL_VERSION(a, b, c)) << 8) + (d))
 
 #ifdef RT_PATCH_VERSION
 #define LTTNG_RT_VERSION_CODE \
-	((LINUX_VERSION_CODE << 8) + RT_PATCH_VERSION)
+	((LTTNG_LINUX_VERSION_CODE << 8) + RT_PATCH_VERSION)
 #else
 #define LTTNG_RT_VERSION_CODE 	0
 #endif