X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-kconsumerd%2Fltt-kconsumerd.c;h=a81be55e7c9dbdaed5daf63c2c68d4c6280ac1a8;hp=7eab42e522d0f45bcb126e101f90d4d543a604e4;hb=558e70e9829c97ecd228516f6e312768be0536d7;hpb=5348b470cf00157d738300e28bcab78ea203ec0f

diff --git a/ltt-kconsumerd/ltt-kconsumerd.c b/ltt-kconsumerd/ltt-kconsumerd.c
index 7eab42e52..a81be55e7 100644
--- a/ltt-kconsumerd/ltt-kconsumerd.c
+++ b/ltt-kconsumerd/ltt-kconsumerd.c
@@ -38,12 +38,11 @@
 #include <sys/mman.h>
 #include <assert.h>
 
+#include <ltt-kconsumerd.h>
+#include <lttng-kernel-ctl.h>
+#include <lttng-sessiond-comm.h>
 #include <lttng/lttng-kconsumerd.h>
-
-#include "lttngerr.h"
-#include "kernelctl.h"
-#include "ltt-kconsumerd.h"
-#include "lttng-sessiond-comm.h"
+#include <lttngerr.h>
 
 /* the two threads (receive fd and poll) */
 static pthread_t threads[2];
@@ -296,12 +295,15 @@ static int on_recv_fd(struct lttng_kconsumerd_fd *kconsumerd_fd)
 
 	if (kconsumerd_fd->output == LTTNG_EVENT_MMAP) {
 		/* get the len of the mmap region */
-		ret = kernctl_get_mmap_len(kconsumerd_fd->consumerd_fd, &kconsumerd_fd->mmap_len);
+		unsigned long mmap_len;
+
+		ret = kernctl_get_mmap_len(kconsumerd_fd->consumerd_fd, &mmap_len);
 		if (ret != 0) {
 			ret = errno;
 			perror("kernctl_get_mmap_len");
 			goto error_close_fd;
 		}
+		kconsumerd_fd->mmap_len = (size_t) mmap_len;
 
 		kconsumerd_fd->mmap_base = mmap(NULL, kconsumerd_fd->mmap_len,
 				PROT_READ, MAP_PRIVATE, kconsumerd_fd->consumerd_fd, 0);