From: Alexandre Montplaisir Date: Tue, 26 May 2015 20:12:00 +0000 (-0400) Subject: Fix: Update kmem event for Ubuntu's 3.16 kernel X-Git-Tag: v2.5.6~3 X-Git-Url: https://git.lttng.org/?a=commitdiff_plain;h=640886da648d574967abe6c7e1db2b055ef350cb;hp=434c6691a5af2982f6aa9a0b2fcceb2d0759a90e;p=lttng-modules.git 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 --- diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h index 049289ea..fe354bc4 100644 --- a/instrumentation/events/lttng-module/kmem.h +++ b/instrumentation/events/lttng-module/kmem.h @@ -288,7 +288,8 @@ DEFINE_EVENT_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_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)) TRACE_EVENT(mm_page_alloc_extfrag,