Fix: arm-32 build

The current master branch of lttng-modules doesn't seem to compile for
arm-32 builds.

The patch below repairs the build for arm (and still builds on a x86)
(tested on Ubuntu 12.04 LTS x86 + imx6 solo)

Signed-off-by: Martin Leisener <martin@leisener.de>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

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 f0e031acaff1ef89ba45059f345aa184fe613aad..79efa547cb17dacfe8aef81a8fc9f3a40745e7ea 100644 (file)
--- 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 1ae894be3ea95b4e0ca11aaf90af605cd5b02a85..7eec04c0f269682a1aed08bbc501a9a992a127ea 100644 (file)
--- 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() */