From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 15 Jun 2015 16:28:25 +0000 (-0400)
Subject: Fix: Incorrect Ubuntu kernel patchlevel
X-Git-Tag: v2.6.2~2
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=c29aa9374e83e9bd2096043756825f163ac4a813;p=lttng-modules.git

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 5de4c979..83f3488d 100644
--- a/instrumentation/events/lttng-module/kmem.h
+++ b/instrumentation/events/lttng-module/kmem.h
@@ -289,8 +289,8 @@ 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_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(mm_page_alloc_extfrag,
 
diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index dddd34dd..3dc61b0f 100644
--- 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();