fix: double defined LTTNG_KERNEL_VERSION

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

diff --git a/include/lttng/kernel-version.h b/include/lttng/kernel-version.h
index 38b47cc34e424fc92fb47d82a624b42832461b00..a41829f0a6160ee33be6f8ea9da258910148c752 100644 (file)
--- a/include/lttng/kernel-version.h
+++ b/include/lttng/kernel-version.h
@@ -13,9 +13,6 @@
 #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
-
 /*
  * The following defines are extracted from the toplevel Linux Makefile and
  * passed on the command line -with '-D'.
@@ -70,11 +67,11 @@
 /* Ubuntu */
 
 #define LTTNG_UBUNTU_KERNEL_VERSION(a, b, c, d) \
-       (((LTTNG_KERNEL_VERSION(a, b, c)) << 8) + (d))
+       (((LTTNG_KERNEL_VERSION(a, b, c)) << 16) + (d))
 
 #ifdef UTS_UBUNTU_RELEASE_ABI
 #define LTTNG_UBUNTU_VERSION_CODE \
-       ((LTTNG_LINUX_VERSION_CODE << 8) + UTS_UBUNTU_RELEASE_ABI)
+       ((LTTNG_LINUX_VERSION_CODE << 16) + UTS_UBUNTU_RELEASE_ABI)
 #else
 #define LTTNG_UBUNTU_VERSION_CODE      0
 #endif