From: Simon Marchi Date: Sun, 7 Dec 2014 17:14:19 +0000 (-0500) Subject: Fix: compaction instrumentation update for 3.14.x stable kernels X-Git-Tag: v2.5.2~1 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=286a94365681be3a4b5f5136f59f69ce8bf325f9;p=lttng-modules.git 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 Reported-by: Bjørn Forsman Signed-off-by: Mathieu Desnoyers --- diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h index 22024e9e..b6e4620b 100644 --- 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,