[lttng-dev] [PATCH lttng-modules] Fix: mm_page_alloc_extfrag instrumentation for kernel 3.14.36

Antoine Busque abusque at efficios.com
Sat Mar 21 15:13:18 EDT 2015


The following commit has been backported from kernel 3.19.2 into
3.14.36, introducing a change to mm_page_alloc_extfrag and therefore
provoking a build failure on a 3.14.36 kernel:

commit a4f3f96f850db69890f47984c60606a2362bee89
Author: Vlastimil Babka <vbabka at suse.cz>
Date:   Wed Feb 11 15:28:15 2015 -0800

    mm: when stealing freepages, also take pages created by splitting buddy page

    commit 99592d598eca62bdbbf62b59941c189176dfc614 upstream.

This patch adds the proper version check to allow building on 3.14.y.

Signed-off-by: Antoine Busque <abusque at efficios.com>
---
 instrumentation/events/lttng-module/kmem.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h
index 3782ac6..710c9fa 100644
--- a/instrumentation/events/lttng-module/kmem.h
+++ b/instrumentation/events/lttng-module/kmem.h
@@ -286,7 +286,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_PRINT(mm_page, mm_page_pcpu_drain,
 		__entry->order, __entry->migratetype)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)	\
+	|| LTTNG_KERNEL_RANGE(3,14,36, 3,15,0))
 
 LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag,
 
-- 
2.3.3




More information about the lttng-dev mailing list