[lttng-dev] [lttng-modules PATCH] Fix compilation on Ubuntu 14.10

[Mathieu Desnoyers]

merged, thanks!

Mathieu

----- Original Message -----
> From: "Alexandre Montplaisir" <alexmonthy at voxpopuli.im>
> To: lttng-dev at lists.lttng.org
> Sent: Friday, October 3, 2014 3:58:02 PM
> Subject: [lttng-dev] [lttng-modules PATCH] 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 at voxpopuli.im>
> ---
>  lttng-statedump-impl.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
> index bab5d9f..e0d74f6 100644
> --- a/lttng-statedump-impl.c
> +++ b/lttng-statedump-impl.c
> @@ -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();
> --
> 2.1.0
> 
> 
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
> 

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com