[PATCH] lttng-module: sched.h: Fix compilation on 3.9 kernel

[PATCH] lttng-module: sched.h: Fix compilation on 3.9 kernel

[maxin.john]

From: "Maxin B. John" <maxin.john@enea.com>

With commit 8bd75c77b7c6a3954140dd2e20346aef3efe4a35
included in 3.9-rc1 kernel, rt specific bits in "linux/sched.h"
were moved into new header file "linux/sched/rt.h".

Fixes this compilation error:
 CC [M]  /home/majo/lttng/lttng-modules/probes/lttng-probe-sched.o
...
/home/majo/lttng/lttng-modules/probes/../instrumentation/events/lttng-module
/../../../probes/../instrumentation/events/lttng-module/sched.h:
In function '__event_probe__sched_switch':
/home/majo/lttng/lttng-modules/probes/../instrumentation/events/lttng-module
/../../../probes/../instrumentation/events/lttng-module/sched.h:164:1:
error: 'MAX_RT_PRIO' undeclared (first use in this function)
...

Signed-off-by: Maxin B. John <maxin.john@enea.com>
---
 instrumentation/events/lttng-module/sched.h |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/instrumentation/events/lttng-module/sched.h b/instrumentation/events/lttng-module/sched.h
index e42acd2..25faad0 100644
--- a/instrumentation/events/lttng-module/sched.h
+++ b/instrumentation/events/lttng-module/sched.h
@@ -8,6 +8,9 @@
 #include <linux/tracepoint.h>
 #include <linux/binfmts.h>
 #include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
+#include <linux/sched/rt.h>
+#endif
 
 #ifndef _TRACE_SCHED_DEF_
 #define _TRACE_SCHED_DEF_
-- 
1.7.5.4

Re: [PATCH] lttng-module: sched.h: Fix compilation on 3.9 kernel

[Mathieu Desnoyers]

* maxin.john@enea.com (maxin.john@enea.com) wrote:
> From: "Maxin B. John" <maxin.john@enea.com>
> 
> With commit 8bd75c77b7c6a3954140dd2e20346aef3efe4a35
> included in 3.9-rc1 kernel, rt specific bits in "linux/sched.h"
> were moved into new header file "linux/sched/rt.h".

merged into both master and stable-2.1 branches, thanks!

Mathieu

> 
> Fixes this compilation error:
>  CC [M]  /home/majo/lttng/lttng-modules/probes/lttng-probe-sched.o
> ...
> /home/majo/lttng/lttng-modules/probes/../instrumentation/events/lttng-module
> /../../../probes/../instrumentation/events/lttng-module/sched.h:
> In function '__event_probe__sched_switch':
> /home/majo/lttng/lttng-modules/probes/../instrumentation/events/lttng-module
> /../../../probes/../instrumentation/events/lttng-module/sched.h:164:1:
> error: 'MAX_RT_PRIO' undeclared (first use in this function)
> ...
> 
> Signed-off-by: Maxin B. John <maxin.john@enea.com>
> ---
>  instrumentation/events/lttng-module/sched.h |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/instrumentation/events/lttng-module/sched.h b/instrumentation/events/lttng-module/sched.h
> index e42acd2..25faad0 100644
> --- a/instrumentation/events/lttng-module/sched.h
> +++ b/instrumentation/events/lttng-module/sched.h
> @@ -8,6 +8,9 @@
>  #include <linux/tracepoint.h>
>  #include <linux/binfmts.h>
>  #include <linux/version.h>
> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
> +#include <linux/sched/rt.h>
> +#endif
>  
>  #ifndef _TRACE_SCHED_DEF_
>  #define _TRACE_SCHED_DEF_
> -- 
> 1.7.5.4
> 

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