From dd0c715622641b15480c46175553b71198243368 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Tue, 26 May 2015 16:12:00 -0400 Subject: [PATCH] Fix: Update kmem event for Ubuntu's 3.16 kernel The upstream patch in question in commit 72906e1 was cherry-picked into Ubuntu's 3.16 kernel backport branch (called lts-utopic). The version check should also include this branch. The other backport branch, lts-vivid, and all following ones will be covered by the standard LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2) check, so should not require other workarounds. References #889. Signed-off-by: Alexandre Montplaisir Signed-off-by: Mathieu Desnoyers --- 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 1d4eb62b..6461788b 100644 --- a/instrumentation/events/lttng-module/kmem.h +++ b/instrumentation/events/lttng-module/kmem.h @@ -203,7 +203,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_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_DEBIAN_KERNEL_RANGE(3,16,7,9,0,0, 3,17,0,0,0,0) \ - || LTTNG_UBUNTU_KERNEL_RANGE(3,13,0,50, 3,14,0,0)) + || LTTNG_UBUNTU_KERNEL_RANGE(3,13,0,50, 3,14,0,0) \ + || LTTNG_UBUNTU_KERNEL_RANGE(3,16,0,38, 3,17,0,0)) LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag, -- 2.39.5