From: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Date: Fri, 3 Oct 2014 19:58:02 +0000 (-0400)
Subject: Fix compilation on Ubuntu 14.10
X-Git-Tag: v2.5.1~2
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=00d877b028c90ba6d1e98d0085b159cf88822499;p=lttng-modules.git

Fix compilation on Ubuntu 14.10

Extend the range introduced in 2260bfd to also include Ubuntu's
3.16 kernel. The API-changing patch was also backported to that series.
This will also be required for Trusty users once the the Utopic
hardware-enablement stack, including that 3.16 kernel, comes in.

Refs #838. See comment #2 for the patch in question.

Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index d2cf8a3f..cf92aa44 100644
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -411,7 +411,8 @@ void lttng_statedump_process_ns(struct lttng_session *session,
 	 * for details.
 	 */
 #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,13,11,36, 3,14,0,0) || \
+		LTTNG_UBUNTU_KERNEL_RANGE(3,16,0,11, 3,17,0,0))
 	proxy = p->nsproxy;
 #else
 	rcu_read_lock();
@@ -429,7 +430,8 @@ void lttng_statedump_process_ns(struct lttng_session *session,
 			p, type, mode, submode, status, NULL);
 	}
 #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,13,11,36, 3,14,0,0) || \
+		LTTNG_UBUNTU_KERNEL_RANGE(3,16,0,11, 3,17,0,0))
 	/* (nothing) */
 #else
 	rcu_read_unlock();