X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fcounter%2Fshm.c;h=8b65d1fc6137dcb80dafbe5c39689ed8c5010c29;hb=bb863844b80f455f7c44279da57d966f7d42ab51;hp=d1116c9c19584f86d0542843f509f4e2bd917cdb;hpb=cdff92e0e0e875348b6ec549ef9d2282161faf80;p=lttng-ust.git

diff --git a/src/common/counter/shm.c b/src/common/counter/shm.c
index d1116c9c..8b65d1fc 100644
--- a/src/common/counter/shm.c
+++ b/src/common/counter/shm.c
@@ -29,7 +29,7 @@
 
 #include "common/macros.h"
 #include "common/ust-fd.h"
-#include "libringbuffer/mmap.h"
+#include "common/compat/mmap.h"
 
 /*
  * Ensure we have the required amount of space available by writing 0
@@ -192,11 +192,19 @@ static bool lttng_is_numa_available(void)
 }
 #endif
 
+#ifdef HAVE_LIBNUMA
 struct lttng_counter_shm_object *lttng_counter_shm_object_table_alloc(struct lttng_counter_shm_object_table *table,
 			size_t memory_map_size,
 			enum lttng_counter_shm_object_type type,
 			int cpu_fd,
 			int cpu)
+#else
+struct lttng_counter_shm_object *lttng_counter_shm_object_table_alloc(struct lttng_counter_shm_object_table *table,
+			size_t memory_map_size,
+			enum lttng_counter_shm_object_type type,
+			int cpu_fd,
+			int cpu __attribute__((unused)))
+#endif
 {
 	struct lttng_counter_shm_object *shm_object;
 #ifdef HAVE_LIBNUMA