tracepoint: Refactor representation of nested types

[lttng-modules.git] / probes / lttng-kretprobes.c

diff --git a/probes/lttng-kretprobes.c b/probes/lttng-kretprobes.c
index 84eca9b350ff86c1c643695d01f7fbe927270bae..40938f2b7110bd5506862d982ee8deca997bc614 100644 (file)
--- a/probes/lttng-kretprobes.c
+++ b/probes/lttng-kretprobes.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
  *
  * probes/lttng-kretprobes.c
  *
@@ -16,6 +16,7 @@
 #include <wrapper/vmalloc.h>
 #include <wrapper/irqflags.h>
 #include <lttng-tracer.h>
+#include <blacklist/kprobes.h>
 
 enum lttng_kretprobe_type {
        EVENT_ENTRY = 0,
@@ -129,21 +130,21 @@ int lttng_create_kprobe_event(const char *name, struct lttng_event *event,
        }
        fields[0].name = "ip";
        fields[0].type.atype = atype_integer;
-       fields[0].type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
-       fields[0].type.u.basic.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
-       fields[0].type.u.basic.integer.signedness = lttng_is_signed_type(unsigned long);
-       fields[0].type.u.basic.integer.reverse_byte_order = 0;
-       fields[0].type.u.basic.integer.base = 16;
-       fields[0].type.u.basic.integer.encoding = lttng_encode_none;
+       fields[0].type.u.integer.size = sizeof(unsigned long) * CHAR_BIT;
+       fields[0].type.u.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
+       fields[0].type.u.integer.signedness = lttng_is_signed_type(unsigned long);
+       fields[0].type.u.integer.reverse_byte_order = 0;
+       fields[0].type.u.integer.base = 16;
+       fields[0].type.u.integer.encoding = lttng_encode_none;
 
        fields[1].name = "parent_ip";
        fields[1].type.atype = atype_integer;
-       fields[1].type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
-       fields[1].type.u.basic.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
-       fields[1].type.u.basic.integer.signedness = lttng_is_signed_type(unsigned long);
-       fields[1].type.u.basic.integer.reverse_byte_order = 0;
-       fields[1].type.u.basic.integer.base = 16;
-       fields[1].type.u.basic.integer.encoding = lttng_encode_none;
+       fields[1].type.u.integer.size = sizeof(unsigned long) * CHAR_BIT;
+       fields[1].type.u.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
+       fields[1].type.u.integer.signedness = lttng_is_signed_type(unsigned long);
+       fields[1].type.u.integer.reverse_byte_order = 0;
+       fields[1].type.u.integer.base = 16;
+       fields[1].type.u.integer.encoding = lttng_encode_none;
 
        desc->owner = THIS_MODULE;
        event->desc = desc;