[lttng-dev] ] [PATCH lttng-modules] Fix: Repair of broken arm-32 build Signed-off-by: Martin Leisener <martin at leisener.de>

[Mathieu Desnoyers]

merged with small cosmetic fixes to the changelog, thanks!

Mathieu

----- On May 26, 2015, at 11:04 AM, Martin Leisener martin at leisener.de wrote:

> Hi,
> 
> I found that the current master branch of lttng-modules doesn't seem to compile
> for arm-32 builds.
> 
> Utilizing the patch below it will build again for arm (and still an x86)
> (tested on Ubuntu 12.04 LTS x86 + imx6 solo)
> 
> It's my first patch I contribute so please be kind, if something is amiss or
> should have been provided differently...
> 
> 
> Regards Martin
> 
> ---
> .../arm-32-syscalls-3.4.25_integers_override.h     |    2 +-
> lttng-events.c                                     |    1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git
> a/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers_override.h
> b/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers_override.h
> index f0e031a..79efa54 100644
> ---
> a/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers_override.h
> +++
> b/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers_override.h
> @@ -23,7 +23,7 @@ SC_LTTNG_TRACEPOINT_EVENT(sync_file_range2,
> 		ctf_integer_hex(int, fd, fd)
> 		ctf_integer_hex(loff_t, offset, offset)
> 		ctf_integer_hex(loff_t, nbytes, nbytes)
> -		ctf_integer_hex(unsigned int, flags), flags)
> +		ctf_integer_hex(unsigned int, flags, flags)
> 	)
> )
> diff --git a/lttng-events.c b/lttng-events.c
> index 1ae894b..7eec04c 100644
> --- a/lttng-events.c
> +++ b/lttng-events.c
> @@ -38,6 +38,7 @@
> #include <linux/anon_inodes.h>
> #include "wrapper/file.h"
> #include <linux/jhash.h>
> +#include <linux/uaccess.h>
>  #include "wrapper/uuid.h"
> #include "wrapper/vmalloc.h"	/* for wrapper_vmalloc_sync_all() */
> --
> 1.7.9.5
> 
> 
> _______________________________________________
> 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