X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libcounter%2Fcounter.c;h=d2b7032af2ada6a6e623a8a755a4e0180e3e98c7;hb=cd61d9bfa5fd334b086831dcbdec63da6c0d1a16;hp=4010d5dd7f152b8c29d300d4e15ac751a6c04cc5;hpb=ebabbf580131acd1fe246c4d31fc5c044d36a038;p=lttng-ust.git

diff --git a/libcounter/counter.c b/libcounter/counter.c
index 4010d5dd..d2b7032a 100644
--- a/libcounter/counter.c
+++ b/libcounter/counter.c
@@ -9,14 +9,15 @@
 #include <errno.h>
 #include "counter.h"
 #include "counter-internal.h"
-#include <lttng/bitmap.h>
 #include <urcu/system.h>
 #include <urcu/compiler.h>
 #include <stdbool.h>
-#include <helper.h>
-#include <lttng/align.h>
+#include <ust-helper.h>
 #include "smp.h"
 #include "shm.h"
+#include "ust-compat.h"
+
+#include "ust-bitmap.h"
 
 static size_t lttng_counter_get_dimension_nr_elements(struct lib_counter_dimension *dimension)
 {
@@ -75,9 +76,9 @@ static int lttng_counter_layout_init(struct lib_counter *counter, int cpu, int s
 	counters_offset = shm_length;
 	shm_length += counter_size * nr_elem;
 	overflow_offset = shm_length;
-	shm_length += ALIGN(nr_elem, 8) / 8;
+	shm_length += LTTNG_UST_ALIGN(nr_elem, 8) / 8;
 	underflow_offset = shm_length;
-	shm_length += ALIGN(nr_elem, 8) / 8;
+	shm_length += LTTNG_UST_ALIGN(nr_elem, 8) / 8;
 	layout->shm_len = shm_length;
 	if (counter->is_daemon) {
 		/* Allocate and clear shared memory. */
@@ -188,7 +189,7 @@ int validate_args(const struct lib_counter_config *config,
 		return -1;
 	if (!(config->alloc & COUNTER_ALLOC_PER_CPU) && counter_cpu_fds)
 		return -1;
-	if (!(config->alloc & COUNTER_ALLOC_PER_CPU) && counter_cpu_fds >= 0)
+	if (!(config->alloc & COUNTER_ALLOC_PER_CPU) && nr_counter_cpu_fds >= 0)
 		return -1;
 	if (counter_cpu_fds && nr_cpus != nr_counter_cpu_fds)
 		return -1;