Cleanup: namespace 'align' macros

[lttng-tools.git] / src / common / kernel-ctl / kernel-ctl.c

diff --git a/src/common/kernel-ctl/kernel-ctl.c b/src/common/kernel-ctl/kernel-ctl.c
index 5373c703943f7710576337bb9995e8cb4321f28b..c535054cc1ca9d09b7a21d56b0f67c38fc18a896 100644 (file)
--- a/src/common/kernel-ctl/kernel-ctl.c
+++ b/src/common/kernel-ctl/kernel-ctl.c
@@ -16,7 +16,6 @@
 #include <common/macros.h>
 #include <common/compat/errno.h>
 #include <stdarg.h>
-#include <assert.h>
 #include <common/time.h>
 
 #include "kernel-ctl.h"
@@ -25,7 +24,7 @@
 #define LTTNG_IOCTL_CHECK(fildes, request, ...)                         \
        ({                                                              \
                int _ioctl_ret = ioctl(fildes, request, ##__VA_ARGS__); \
-               assert(_ioctl_ret <= 0);                                \
+               LTTNG_ASSERT(_ioctl_ret <= 0);                                \
                !_ioctl_ret ? 0 : -errno;                               \
        })
 
@@ -180,7 +179,7 @@ int kernctl_syscall_mask(int fd, char **syscall_mask, uint32_t *nr_bits)
                goto end;
        }
 
-       array_alloc_len = ALIGN(kmask_len.len, 8) >> 3;
+       array_alloc_len = lttng_align_ceil(kmask_len.len, 8) >> 3;
 
        kmask = zmalloc(sizeof(*kmask) + array_alloc_len);
        if (!kmask) {