Fix: move "user" attribute from field to type

[lttng-modules.git] / include / instrumentation / syscalls / headers / syscalls_integers_override.h

diff --git a/include/instrumentation/syscalls/headers/syscalls_integers_override.h b/include/instrumentation/syscalls/headers/syscalls_integers_override.h
index f8106784f9c8be35e133dfcca2d51dd2cd715624..74bc9dcf5b1c91599c2df21193a673f1cd993fd1 100644 (file)
--- a/include/instrumentation/syscalls/headers/syscalls_integers_override.h
+++ b/include/instrumentation/syscalls/headers/syscalls_integers_override.h
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) */
 
-#include <linux/mman.h>
-
 #ifndef CREATE_SYSCALL_TABLE
 
+#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
+
 /*
  * The `flags` argument of the mmap syscall is split in two parts:
  * - The type of mapping is described by the four least significant bits of the 4
@@ -93,13 +93,13 @@ SC_LTTNG_TRACEPOINT_ENUM(lttng_mmap_flags_options,
        lttng_kernel_static_event_field("type",                         \
                lttng_kernel_static_type_enum(&__enum_lttng_mmap_flags_mapping_type, \
                                lttng_kernel_static_type_integer(4, 1, 0, __BYTE_ORDER, 16)), \
-               false, false, false)
+               false, false)
 
 #define LTTNG_MMAP_FLAGS_OPTIONS                                       \
        lttng_kernel_static_event_field("options",                      \
                lttng_kernel_static_type_enum(&__enum_lttng_mmap_flags_options, \
                                lttng_kernel_static_type_integer(28, 1, 0, __BYTE_ORDER, 16)), \
-               false, false, false)
+               false, false)
 
 #if (__BYTE_ORDER == __LITTLE_ENDIAN)
 #define LTTNG_MMAP_FLAGS                       \
@@ -115,10 +115,8 @@ lttng_kernel_static_event_field_array(             \
 )
 #endif
 
-/*
- * Use a custom field here so that tracer writes a single integer and the
- * work of splitting it up in two fields is left to the trace reader.
- */
+#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */
+
 #define OVERRIDE_32_mmap
 #define OVERRIDE_64_mmap
 SC_LTTNG_TRACEPOINT_EVENT(mmap,
@@ -130,6 +128,12 @@ SC_LTTNG_TRACEPOINT_EVENT(mmap,
        TP_FIELDS(sc_exit(ctf_integer_hex(unsigned long, ret, ret))
                sc_in(ctf_integer_hex(unsigned long, addr, addr))
                sc_in(ctf_integer(size_t, len, len))
+#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
+               /*
+                * Use a custom field here so that tracer writes a single
+                * integer and the work of splitting it up in two fields is
+                * left to the trace reader.
+                */
                sc_in(ctf_enum(lttng_mmap_protection, int, prot, prot))
                sc_in(
                        ctf_custom_field(
@@ -142,11 +146,16 @@ SC_LTTNG_TRACEPOINT_EVENT(mmap,
                                )
                        )
                )
+#else
+               sc_in(ctf_integer(int, prot, prot))
+               sc_in(ctf_integer(int, flags, flags))
+#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */
                sc_in(ctf_integer(int, fd, fd))
                sc_in(ctf_integer(off_t, offset, off))
        )
 )
 
+#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
 /*
  * Enumeration of the open flags, as described in the 'open'
  * system call man page.
@@ -211,5 +220,6 @@ SC_LTTNG_TRACEPOINT_EVENT(fcntl,
                sc_in(ctf_enum(lttng_fcntl_cmd_flags, unsigned int, cmd, cmd))
                sc_inout(ctf_integer(unsigned long, arg, arg)))
 )
+#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */
 
 #endif /* CREATE_SYSCALL_TABLE */