Fix: Incorrect Ubuntu kernel patchlevel

The kernel version used should be the one in Makefile and generated
version.h, not the one tweaked by Ubuntu as "0" in the built package.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h
index 6461788b2d145d51e35d9417802d5c7b339c7023..85c116bce64dab5272e8734daf06c35e73bf8efc 100644 (file)
--- a/instrumentation/events/lttng-module/kmem.h
+++ b/instrumentation/events/lttng-module/kmem.h
@@ -203,8 +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,16,0,38, 3,17,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))
 
 LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
 

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index dddd34ddf054cd25a12de60d95a7b3c26f45f62b..3dc61b0f8e3e3defcbaebe98f10c4979dfa40bb0 100644 (file)
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -403,7 +403,7 @@ void lttng_statedump_process_ns(struct lttng_session *session,
         */
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) || \
                LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \
-               LTTNG_UBUNTU_KERNEL_RANGE(3,16,0,11, 3,17,0,0))
+               LTTNG_UBUNTU_KERNEL_RANGE(3,16,1,11, 3,17,0,0))
        proxy = p->nsproxy;
 #else
        rcu_read_lock();
@@ -422,7 +422,7 @@ void lttng_statedump_process_ns(struct lttng_session *session,
        }
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) || \
                LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \
-               LTTNG_UBUNTU_KERNEL_RANGE(3,16,0,11, 3,17,0,0))
+               LTTNG_UBUNTU_KERNEL_RANGE(3,16,1,11, 3,17,0,0))
        /* (nothing) */
 #else
        rcu_read_unlock();