* [lttng-dev] [PATCH lttng-modules] Fix: RHEL kernel 3.10.0-327.13.1 compat
@ 2016-04-20 21:50 Michael Jeanson
2016-04-20 22:24 ` Mathieu Desnoyers
0 siblings, 1 reply; 2+ messages in thread
From: Michael Jeanson @ 2016-04-20 21:50 UTC (permalink / raw)
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [lttng-dev] [PATCH lttng-modules] Fix: RHEL kernel 3.10.0-327.13.1 compat
2016-04-20 21:50 [lttng-dev] [PATCH lttng-modules] Fix: RHEL kernel 3.10.0-327.13.1 compat Michael Jeanson
@ 2016-04-20 22:24 ` Mathieu Desnoyers
0 siblings, 0 replies; 2+ messages in thread
From: Mathieu Desnoyers @ 2016-04-20 22:24 UTC (permalink / raw)
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-04-20 22:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-20 21:50 [lttng-dev] [PATCH lttng-modules] Fix: RHEL kernel 3.10.0-327.13.1 compat Michael Jeanson
2016-04-20 22:24 ` Mathieu Desnoyers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox