From: Michael Jeanson Date: Fri, 14 Aug 2015 15:37:31 +0000 (-0400) Subject: Fix: mm_page_alloc_extfrag instrumentation for kernel 3.18.10 X-Git-Tag: v2.6.3~4 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=4d384f156f68cfc308f7f72971e48b19cfe31472;p=lttng-modules.git Fix: mm_page_alloc_extfrag instrumentation for kernel 3.18.10 The following commit has been backported from kernel 3.19.2 into 3.18.10, introducing a change to mm_page_alloc_extfrag and therefore provoking a build failure on a 3.18.10 kernel: commit a4f3f96f850db69890f47984c60606a2362bee89 Author: Vlastimil Babka 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.18.y. Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h index 83f3488d..171fcb97 100644 --- a/instrumentation/events/lttng-module/kmem.h +++ b/instrumentation/events/lttng-module/kmem.h @@ -288,6 +288,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_PRINT(mm_page, mm_page_pcpu_drain, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2) \ || LTTNG_KERNEL_RANGE(3,14,36, 3,15,0) \ + || LTTNG_KERNEL_RANGE(3,18,10, 3,19,0) \ || LTTNG_DEBIAN_KERNEL_RANGE(3,16,7,9,0,0, 3,17,0,0,0,0) \ || LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,50, 3,14,0,0) \ || LTTNG_UBUNTU_KERNEL_RANGE(3,16,7,38, 3,17,0,0))