Whole series merged, thanks! Mathieu
----- Original Message ----- > From: "Julien Desfossez" <[email protected]> > To: "mathieu desnoyers" <[email protected]> > Cc: [email protected], "Julien Desfossez" <[email protected]> > Sent: Wednesday, October 1, 2014 11:05:08 AM > Subject: [MODULES PATCH 1/4] Introduce macros to check Ubuntu kernel version > > Signed-off-by: Julien Desfossez <[email protected]> > --- > lttng-kernel-version.h | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/lttng-kernel-version.h b/lttng-kernel-version.h > index 0eb56b3..3958d74 100644 > --- a/lttng-kernel-version.h > +++ b/lttng-kernel-version.h > @@ -24,6 +24,7 @@ > */ > > #include <linux/version.h> > +#include <linux/vermagic.h> > > /* > * This macro checks if the kernel version is between the two specified > @@ -33,4 +34,18 @@ > (LINUX_VERSION_CODE >= KERNEL_VERSION(a_low, b_low, c_low) && \ > 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 */ > -- > 1.9.1 > > -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
