Fix: update writeback instrumentation for kernel 4.14

[lttng-modules.git] / lttng-context-cpu-id.c

diff --git a/lttng-context-cpu-id.c b/lttng-context-cpu-id.c
index dd60b199775fc7c615f0ffeb279b1a5f968b3985..f2bab8feac2904a0fe5c3f370c6ab29877a35d9b 100644 (file)
--- a/lttng-context-cpu-id.c
+++ b/lttng-context-cpu-id.c
@@ -23,19 +23,18 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
-#include <linux/timex.h>
-#include "lttng-events.h"
-#include "wrapper/ringbuffer/frontend_types.h"
-#include "wrapper/vmalloc.h"
-#include "lttng-tracer.h"
+#include <lttng-events.h>
+#include <wrapper/ringbuffer/frontend_types.h>
+#include <wrapper/vmalloc.h>
+#include <lttng-tracer.h>
 
 static
 size_t cpu_id_get_size(size_t offset)
 {
        size_t size = 0;
 
-       size += lib_ring_buffer_align(offset, lttng_alignof(cycles_t));
-       size += sizeof(cycles_t);
+       size += lib_ring_buffer_align(offset, lttng_alignof(int));
+       size += sizeof(int);
        return size;
 }
 
@@ -44,7 +43,7 @@ void cpu_id_record(struct lttng_ctx_field *field,
                struct lib_ring_buffer_ctx *ctx,
                struct lttng_channel *chan)
 {
-       cycles_t cpu;
+       int cpu;
 
        cpu = ctx->cpu;
        lib_ring_buffer_align_ctx(ctx, lttng_alignof(cpu));
@@ -53,6 +52,7 @@ void cpu_id_record(struct lttng_ctx_field *field,
 
 static
 void cpu_id_get_value(struct lttng_ctx_field *field,
+               struct lttng_probe_ctx *lttng_probe_ctx,
                union lttng_ctx_value *value)
 {
        value->s64 = smp_processor_id();
@@ -71,9 +71,9 @@ int lttng_add_cpu_id_to_ctx(struct lttng_ctx **ctx)
        }
        field->event_field.name = "cpu_id";
        field->event_field.type.atype = atype_integer;
-       field->event_field.type.u.basic.integer.size = sizeof(cycles_t) * CHAR_BIT;
-       field->event_field.type.u.basic.integer.alignment = lttng_alignof(cycles_t) * CHAR_BIT;
-       field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(cycles_t);
+       field->event_field.type.u.basic.integer.size = sizeof(int) * CHAR_BIT;
+       field->event_field.type.u.basic.integer.alignment = lttng_alignof(int) * CHAR_BIT;
+       field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(int);
        field->event_field.type.u.basic.integer.reverse_byte_order = 0;
        field->event_field.type.u.basic.integer.base = 10;
        field->event_field.type.u.basic.integer.encoding = lttng_encode_none;
@@ -85,11 +85,3 @@ int lttng_add_cpu_id_to_ctx(struct lttng_ctx **ctx)
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_cpu_id_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit CPU id Context");
-MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
-       __stringify(LTTNG_MODULES_MINOR_VERSION) "."
-       __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
-       LTTNG_MODULES_EXTRAVERSION);