From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Fri, 23 Nov 2012 23:10:38 +0000 (-0500)
Subject: Fix compilation for 3.0 branch (>= 3.0.39)
X-Git-Tag: v2.2.0-rc1~36
X-Git-Url: https://git.lttng.org/?a=commitdiff_plain;h=49bafb1440249c0f4e7d5161ef0ef8ae871102bf;hp=5fa38800d965d5fa35a2c0c9a93e330711ec87e0;p=lttng-modules.git

Fix compilation for 3.0 branch (>= 3.0.39)

The isolate_mode_t type that appeared in 3.2 was backported to 3.0.39 so
the version check must be fixed. It was not backported to the 3.1 branch
though, so it must be excluded.

Signed-off-by: Simon Marchi <simon.marchi@polymtl.ca>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/probes/lttng-probe-vmscan.c b/probes/lttng-probe-vmscan.c
index 2abd0e46..0205c7ee 100644
--- a/probes/lttng-probe-vmscan.c
+++ b/probes/lttng-probe-vmscan.c
@@ -30,6 +30,8 @@
  */
 #include <trace/events/vmscan.h>
 
+#include "../lttng-kernel-version.h"
+
 /*
  * Create LTTng tracepoint probes.
  */
@@ -37,7 +39,8 @@
 #define CREATE_TRACE_POINTS
 #define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0))
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(3,0,38)) || \
+	LTTNG_KERNEL_RANGE(3,1,0, 3,1,10)
 typedef int isolate_mode_t;
 #endif