From mboxrd@z Thu Jan  1 00:00:00 1970
From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Date: Wed, 20 Apr 2016 22:24:56 +0000 (UTC)
Subject: [lttng-dev] [PATCH lttng-modules] Fix: RHEL kernel
	3.10.0-327.13.1 compat
In-Reply-To: <1461189005-15862-1-git-send-email-mjeanson@efficios.com>
References: <1461189005-15862-1-git-send-email-mjeanson@efficios.com>
Message-ID: <1374501110.65365.1461191096781.JavaMail.zimbra@efficios.com>

merged into master, 2.8 and 2.7, thanks!

Mathieu

----- On Apr 20, 2016, at 5:50 PM, Michael Jeanson mjeanson at efficios.com wrote:

> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
> 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 4c1a99d..a252043 100644
> --- a/lttng-statedump-impl.c
> +++ b/lttng-statedump-impl.c
> @@ -403,7 +403,8 @@ 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,1,11, 3,17,0,0))
> +		LTTNG_UBUNTU_KERNEL_RANGE(3,16,1,11, 3,17,0,0) || \
> +		LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,13,0, 3,11,0,0,0,0))
> 	proxy = p->nsproxy;
> #else
> 	rcu_read_lock();
> @@ -422,7 +423,8 @@ 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,1,11, 3,17,0,0))
> +		LTTNG_UBUNTU_KERNEL_RANGE(3,16,1,11, 3,17,0,0) || \
> +		LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,13,0, 3,11,0,0,0,0))
> 	/* (nothing) */
> #else
> 	rcu_read_unlock();
> --
> 2.7.4

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