projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: cast LTTNG_KERNEL_VERSION/LTTNG_LINUX_VERSION_CODE to uint64_t
[lttng-modules.git]
/
include
/
lttng
/
kernel-version.h
diff --git
a/include/lttng/kernel-version.h
b/include/lttng/kernel-version.h
index 5f388dce11a0257aa4f0aa7062a55e8418e0f6d9..747a674fc80cab132e0d7fe9ddf2e97b42e91c33 100644
(file)
--- a/
include/lttng/kernel-version.h
+++ b/
include/lttng/kernel-version.h
@@
-11,11
+11,9
@@
#define _LTTNG_KERNEL_VERSION_H
#include <linux/version.h>
#define _LTTNG_KERNEL_VERSION_H
#include <linux/version.h>
+#include <linux/types.h>
#include <generated/utsrelease.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'.
/*
* The following defines are extracted from the toplevel Linux Makefile and
* passed on the command line -with '-D'.
@@
-43,19
+41,22
@@
* of LINUX_VERSION_CODE from the kernel headers and allocate 16bits.
* Otherwise, keep using the version code from the headers to minimise the
* behavior change and avoid regressions.
* of LINUX_VERSION_CODE from the kernel headers and allocate 16bits.
* Otherwise, keep using the version code from the headers to minimise the
* behavior change and avoid regressions.
+ *
+ * Cast the result to uint64_t to prevent overflowing when we append distro
+ * specific version information.
*/
#if (LTTNG_LINUX_PATCH >= 256)
#define LTTNG_KERNEL_VERSION(a, b, c) \
*/
#if (LTTNG_LINUX_PATCH >= 256)
#define LTTNG_KERNEL_VERSION(a, b, c) \
- (((
a) << 24) + ((b) << 16) + (c)
)
+ (((
(a) << 24) + ((b) << 16) + (c)) * 1ULL
)
#define LTTNG_LINUX_VERSION_CODE \
LTTNG_KERNEL_VERSION(LTTNG_LINUX_MAJOR, LTTNG_LINUX_MINOR, LTTNG_LINUX_PATCH)
#else
#define LTTNG_LINUX_VERSION_CODE \
LTTNG_KERNEL_VERSION(LTTNG_LINUX_MAJOR, LTTNG_LINUX_MINOR, LTTNG_LINUX_PATCH)
#else
-#define LTTNG_KERNEL_VERSION(a, b, c)
KERNEL_VERSION(a, b, c
)
-#define LTTNG_LINUX_VERSION_CODE
LINUX_VERSION_CODE
+#define LTTNG_KERNEL_VERSION(a, b, c)
(KERNEL_VERSION(a, b, c) * 1ULL
)
+#define LTTNG_LINUX_VERSION_CODE
(LINUX_VERSION_CODE * 1ULL)
#endif
#endif
This page took
0.027204 seconds
and
4
git commands to generate.