From: Martin Leisener <martin@leisener.de>
Date: Fri, 29 May 2015 20:29:44 +0000 (-0400)
Subject: Fix: arm-32 build
X-Git-Tag: v2.7.0-rc1~10
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=8c6e7f13c778701dec2d6549f1e2ca98970907a0;p=lttng-modules.git

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 f0e031ac..79efa547 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 1ae894be..7eec04c0 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() */