Cleanup: namespace 'align' macros

[lttng-tools.git] / src / common / userspace-probe.c

diff --git a/src/common/userspace-probe.c b/src/common/userspace-probe.c
index 9ce212ef26f04d987da506d56de8ccb94618d571..f5ed86367066b3504dadab91d04810c4d69e441b 100644 (file)
--- a/src/common/userspace-probe.c
+++ b/src/common/userspace-probe.c
@@ -7,6 +7,7 @@
 
 #include "lttng/lttng-error.h"
 #include <common/compat/string.h>
 
 #include "lttng/lttng-error.h"
 #include <common/compat/string.h>

+#include <common/align.h>

 #include <common/error.h>
 #include <common/hashtable/hashtable.h>
 #include <common/hashtable/utils.h>
 #include <common/error.h>
 #include <common/hashtable/hashtable.h>
 #include <common/hashtable/utils.h>


@@ -1634,7 +1635,7 @@ int lttng_userspace_probe_location_function_flatten(
         * the next structure in the buffer probably needs to be
         * aligned too (depending on the arch).
         */
         * the next structure in the buffer probably needs to be
         * aligned too (depending on the arch).
         */

-       padding_needed = ALIGN_TO(storage_needed, sizeof(uint64_t)) - storage_needed;
+       padding_needed = lttng_align_ceil(storage_needed, sizeof(uint64_t)) - storage_needed;

        storage_needed += padding_needed;
 
        if (location->lookup_method) {
        storage_needed += padding_needed;
 
        if (location->lookup_method) {


@@ -1762,7 +1763,7 @@ int lttng_userspace_probe_location_tracepoint_flatten(
         * the next structure in the buffer probably needs to be
         * aligned too (depending on the arch).
         */
         * the next structure in the buffer probably needs to be
         * aligned too (depending on the arch).
         */

-       padding_needed = ALIGN_TO(storage_needed, sizeof(uint64_t)) - storage_needed;
+       padding_needed = lttng_align_ceil(storage_needed, sizeof(uint64_t)) - storage_needed;

        storage_needed += padding_needed;
 
        if (location->lookup_method) {
        storage_needed += padding_needed;
 
        if (location->lookup_method) {