From: David Engraf Date: Wed, 17 Dec 2014 15:17:31 +0000 (-0500) Subject: Conditional compilation introduced by lttng-modules commit X-Git-Tag: v2.6.0~12 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=e9c6ad03a44fac52d7136e328465fa978ffddb47;p=lttng-modules.git Conditional compilation introduced by lttng-modules commit 0007344741ef65259bc52dea72259173dfbf96c0 needs to be applied for kernels 3.12.30 and up in the 3.12.x branch. Signed-off-by: David Engraf Signed-off-by: Mathieu Desnoyers --- diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h index 773a6ad5..3becac87 100644 --- a/instrumentation/events/lttng-module/compaction.h +++ b/instrumentation/events/lttng-module/compaction.h @@ -46,7 +46,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_is TP_ARGS(nr_scanned, nr_taken) ) -#if LTTNG_KERNEL_RANGE(3,14,25, 3,15,0) || \ +#if LTTNG_KERNEL_RANGE(3,12,30, 3,13,0) || \ + LTTNG_KERNEL_RANGE(3,14,25, 3,15,0) || \ (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) LTTNG_TRACEPOINT_EVENT(mm_compaction_migratepages,