X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fkernel-ctl%2Fkernel-ctl.c;h=c535054cc1ca9d09b7a21d56b0f67c38fc18a896;hp=5373c703943f7710576337bb9995e8cb4321f28b;hb=1cbd136b2479ef142bfb339b13d3d25aa772dda5;hpb=acbe1c12301de76ce9d1dce4a1b488cad64839e7 diff --git a/src/common/kernel-ctl/kernel-ctl.c b/src/common/kernel-ctl/kernel-ctl.c index 5373c7039..c535054cc 100644 --- a/src/common/kernel-ctl/kernel-ctl.c +++ b/src/common/kernel-ctl/kernel-ctl.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #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) {