Fix compilation on Ubuntu 14.10
authorAlexandre Montplaisir <alexmonthy@voxpopuli.im>
Fri, 3 Oct 2014 19:58:02 +0000 (15:58 -0400)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Fri, 3 Oct 2014 20:01:34 +0000 (16:01 -0400)
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>
lttng-statedump-impl.c

index bab5d9ff4c2cf1dcdef90e03e777ac5f96a6ebe2..e0d74f6f9e5b257a0636e0b9bebad94b962b7209 100644 (file)
@@ -412,7 +412,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();
@@ -430,7 +431,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();
This page took 0.026594 seconds and 4 git commands to generate.