Fix: compaction instrumentation update for 3.14.x stable kernels

Conditional compilation introduced by lttng-modules commit

  0007344741ef65259bc52dea72259173dfbf96c0

needs to be applied to kernels 3.14.25 and up in the 3.14.x branch.

Signed-off-by: Simon Marchi <simon.marchi@polymtl.ca>
Reported-by: Bjørn Forsman <bjorn.forsman@gmail.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h
index 22024e9ee582856262ffcd52301182cc13744437..b6e4620b0a4373daad973792a0c995d4e06f5bcf 100644 (file)
--- a/instrumentation/events/lttng-module/compaction.h
+++ b/instrumentation/events/lttng-module/compaction.h
@@ -46,7 +46,8 @@ DEFINE_EVENT(mm_compaction_isolate_template, mm_compaction_isolate_freepages,
        TP_ARGS(nr_scanned, nr_taken)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
+#if LTTNG_KERNEL_RANGE(3,14,25, 3,15,0) || \
+       (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
 TRACE_EVENT(mm_compaction_migratepages,
 
        TP_PROTO(unsigned long nr_all,