Merge branch 'master' of git://git.lttng.org/lttng-modules

diff --git a/probes/lttng-tracepoint-event-impl.h b/probes/lttng-tracepoint-event-impl.h
index e1c408298fea396ceda470dcc12f8a10a735654d..cd7af77639945f3326729fe6a84ea2e038d5fd67 100644 (file)
--- a/probes/lttng-tracepoint-event-impl.h
+++ b/probes/lttng-tracepoint-event-impl.h
@@ -1130,7 +1130,7 @@ static void __event_probe__##_name(void *__data, _proto)                \
        struct lib_ring_buffer_ctx __ctx;                                     \
        ssize_t __event_len;                                                  \
        size_t __event_align;                                                 \
-       size_t __orig_dynamic_len_offset, __dynamic_len_idx;                  \
+       size_t __orig_dynamic_len_offset, __dynamic_len_idx __attribute__((unused)); \
        union {                                                               \
                size_t __dynamic_len_removed[ARRAY_SIZE(__event_fields___##_name)];   \
                char __filter_stack_data[2 * sizeof(unsigned long) * ARRAY_SIZE(__event_fields___##_name)]; \
@@ -1204,7 +1204,7 @@ static void __event_probe__##_name(void *__data)                        \
        struct lib_ring_buffer_ctx __ctx;                                     \
        ssize_t __event_len;                                                  \
        size_t __event_align;                                                 \
-       size_t __orig_dynamic_len_offset, __dynamic_len_idx;                  \
+       size_t __orig_dynamic_len_offset, __dynamic_len_idx __attribute__((unused)); \
        union {                                                               \
                size_t __dynamic_len_removed[ARRAY_SIZE(__event_fields___##_name)];   \
                char __filter_stack_data[2 * sizeof(unsigned long) * ARRAY_SIZE(__event_fields___##_name)]; \

diff --git a/tests/Kbuild b/tests/Kbuild
index 340b71bbdb9f710561e1d63b513c8dd1b032e744..5e49007abc0d41eb95441be4aaec2fde67c8b571 100644 (file)
--- a/tests/Kbuild
+++ b/tests/Kbuild
@@ -4,8 +4,10 @@ include $(TOP_LTTNG_MODULES_DIR)/Makefile.ABI.workarounds
 
 ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)
 
-obj-$(CONFIG_LTTNG) += probes/lttng-test.o
+obj-$(CONFIG_LTTNG) += lttng-test.o
+lttng-test-objs := probes/lttng-test.o
 
-obj-$(CONFIG_LTTNG) += clock-plugin/lttng-clock-plugin-test.o
+obj-$(CONFIG_LTTNG) += lttng-clock-plugin-test.o
+lttng-clock-plugin-test-objs := clock-plugin/lttng-clock-plugin-test.o
 
 # vim:syntax=make