[lttng-dev] [PATCH lttng-modules] Fix possible kernel build errors with linux-patches

[Mathieu Desnoyers]

* Andrew Gabbasov (andrew_gabbasov at mentor.com) wrote:
> Kernel sources of version 2.6.32 - 2.6.34 with applied patches
> from linux-patches may fail to compile if tracepoint samples
> are configured to build. Some part of backported commits
> are added to the kernel patches to avoid those errors.

merged into master and stable-2.1, thanks!

Mathieu

> 
> Signed-off-by: Andrew Gabbasov <andrew_gabbasov at mentor.com>
> ---
>  .../backport-tp-2.6.34-tracepoint-data.patch       |   20 +++++++++++++++++---
>  .../backport-tracepoint-data-2.6.32-33.patch       |   20 +++++++++++++++++---
>  2 files changed, 34 insertions(+), 6 deletions(-)
> 
> diff --git a/linux-patches/backport-tp-2.6.34-tracepoint-data.patch b/linux-patches/backport-tp-2.6.34-tracepoint-data.patch
> index 385e87e..0ffd7e1 100644
> --- a/linux-patches/backport-tp-2.6.34-tracepoint-data.patch
> +++ b/linux-patches/backport-tp-2.6.34-tracepoint-data.patch
> @@ -10,9 +10,10 @@ Date:   Sat Sep 1 17:45:09 2012 -0700
>      Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
>  
>  ---
> - include/linux/tracepoint.h |  149 ++++++++++++++++++++++++++++++++++-----------
> - kernel/tracepoint.c        |  144 +++++++++++++++++++++++++++++++------------
> - 2 files changed, 219 insertions(+), 74 deletions(-)
> + include/linux/tracepoint.h             |  149 +++++++++++++++++++++++++--------
> + kernel/tracepoint.c                    |  144 ++++++++++++++++++++++---------
> + samples/tracepoints/tp-samples-trace.h |    4 +-
> + 3 files changed, 220 insertions(+), 77 deletions(-)
>  
>  Index: linux/include/linux/tracepoint.h
>  ===================================================================
> @@ -543,3 +544,16 @@ Index: linux/kernel/tracepoint.c
>   EXPORT_SYMBOL_GPL(tracepoint_probe_unregister_noupdate);
>   
>   /**
> +Index: linux/samples/tracepoints/tp-samples-trace.h
> +===================================================================
> +--- linux.orig/samples/tracepoints/tp-samples-trace.h
> ++++ linux/samples/tracepoints/tp-samples-trace.h
> +@@ -7,7 +7,5 @@
> + DECLARE_TRACE(subsys_event,
> + 	TP_PROTO(struct inode *inode, struct file *file),
> + 	TP_ARGS(inode, file));
> +-DECLARE_TRACE(subsys_eventb,
> +-	TP_PROTO(void),
> +-	TP_ARGS());
> ++DECLARE_TRACE_NOARGS(subsys_eventb);
> + #endif
> diff --git a/linux-patches/backport-tracepoint-data-2.6.32-33.patch b/linux-patches/backport-tracepoint-data-2.6.32-33.patch
> index e344bac..e53b476 100644
> --- a/linux-patches/backport-tracepoint-data-2.6.32-33.patch
> +++ b/linux-patches/backport-tracepoint-data-2.6.32-33.patch
> @@ -10,9 +10,10 @@ Date:   Sat Sep 1 17:45:09 2012 -0700
>      Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
>  
>  ---
> - include/linux/tracepoint.h |  141 ++++++++++++++++++++++++++++++++++----------
> - kernel/tracepoint.c        |  144 ++++++++++++++++++++++++++++++++-------------
> - 2 files changed, 215 insertions(+), 70 deletions(-)
> + include/linux/tracepoint.h             |  141 +++++++++++++++++++++++++-------
> + kernel/tracepoint.c                    |  144 ++++++++++++++++++++++++---------
> + samples/tracepoints/tp-samples-trace.h |    4 +-
> + 3 files changed, 216 insertions(+), 73 deletions(-)
>  
>  Index: linux/include/linux/tracepoint.h
>  ===================================================================
> @@ -539,3 +540,16 @@ Index: linux/kernel/tracepoint.c
>   EXPORT_SYMBOL_GPL(tracepoint_probe_unregister_noupdate);
>   
>   /**
> +Index: linux/samples/tracepoints/tp-samples-trace.h
> +===================================================================
> +--- linux.orig/samples/tracepoints/tp-samples-trace.h
> ++++ linux/samples/tracepoints/tp-samples-trace.h
> +@@ -7,7 +7,5 @@
> + DECLARE_TRACE(subsys_event,
> + 	TP_PROTO(struct inode *inode, struct file *file),
> + 	TP_ARGS(inode, file));
> +-DECLARE_TRACE(subsys_eventb,
> +-	TP_PROTO(void),
> +-	TP_ARGS());
> ++DECLARE_TRACE_NOARGS(subsys_eventb);
> + #endif
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

-- 
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com