Fix: kernels >= 2.6.33 put utsrelease.h in generated/

[lttng-modules.git] / lttng-kernel-version.h

diff --git a/lttng-kernel-version.h b/lttng-kernel-version.h
index 280a398a93e370db16f95b416802fb0ef0946213..ec8cee0b30bc2a710f0629e14ceb89265ac0593d 100644 (file)
--- a/lttng-kernel-version.h
+++ b/lttng-kernel-version.h
@@ -25,12 +25,32 @@
 
 #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))
 
 #endif /* _LTTNG_KERNEL_VERSION_H */