X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=libringbuffer%2Fring_buffer_frontend.c;h=3828a84b8a289ce2ee6bf4c34ba6ee27c9bd1935;hb=b72687b85f4f07a9b63be329ad1fe95b36d24900;hp=4f1af6d07d1444c13e703a8942a5cd65b555f9a7;hpb=bfae873ceedd57108fe2bb53ac5fb095550957d3;p=deliverable%2Flttng-ust.git

diff --git a/libringbuffer/ring_buffer_frontend.c b/libringbuffer/ring_buffer_frontend.c
index 4f1af6d0..3828a84b 100644
--- a/libringbuffer/ring_buffer_frontend.c
+++ b/libringbuffer/ring_buffer_frontend.c
@@ -1022,11 +1022,11 @@ struct lttng_ust_shm_handle *channel_create(const struct lttng_ust_lib_ring_buff
 
 	/* Calculate the shm allocation layout */
 	shmsize = sizeof(struct channel);
-	shmsize += offset_align(shmsize, __alignof__(struct lttng_ust_lib_ring_buffer_shmp));
+	shmsize += lttng_ust_offset_align(shmsize, __alignof__(struct lttng_ust_lib_ring_buffer_shmp));
 	shmsize += sizeof(struct lttng_ust_lib_ring_buffer_shmp) * nr_streams;
 	chansize = shmsize;
 	if (priv_data_align)
-		shmsize += offset_align(shmsize, priv_data_align);
+		shmsize += lttng_ust_offset_align(shmsize, priv_data_align);
 	shmsize += priv_data_size;
 
 	/* Allocate normal memory for channel (not shared) */