Version 2.5.6

[lttng-modules.git] / lttng-context-perf-counters.c

diff --git a/lttng-context-perf-counters.c b/lttng-context-perf-counters.c
index b97b40b9386683ab6f6a4193b93c75199efffed8..0c74234c281711e44f9782bd182577ac7c72e3d2 100644 (file)
--- a/lttng-context-perf-counters.c
+++ b/lttng-context-perf-counters.c
@@ -25,6 +25,7 @@
 #include <linux/perf_event.h>
 #include <linux/list.h>
 #include <linux/string.h>
+#include <linux/cpu.h>
 #include "lttng-events.h"
 #include "wrapper/ringbuffer/frontend_types.h"
 #include "wrapper/vmalloc.h"
@@ -120,7 +121,7 @@ void lttng_destroy_perf_counter_field(struct lttng_ctx_field *field)
  * soon).
  */
 static
-int __cpuinit lttng_perf_counter_cpu_hp_callback(struct notifier_block *nb,
+int lttng_perf_counter_cpu_hp_callback(struct notifier_block *nb,
                                                 unsigned long action,
                                                 void *hcpu)
 {
@@ -244,7 +245,7 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
        field->event_field.type.atype = atype_integer;
        field->event_field.type.u.basic.integer.size = sizeof(uint64_t) * CHAR_BIT;
        field->event_field.type.u.basic.integer.alignment = lttng_alignof(uint64_t) * CHAR_BIT;
-       field->event_field.type.u.basic.integer.signedness = is_signed_type(uint64_t);
+       field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(uint64_t);
        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;
@@ -252,6 +253,7 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
        field->record = perf_counter_record;
        field->u.perf_counter = perf_field;
        perf_field->hp_enable = 1;
+       lttng_context_update(*ctx);
 
        wrapper_vmalloc_sync_all();
        return 0;
@@ -282,3 +284,7 @@ error_attr:
 MODULE_LICENSE("GPL and additional rights");
 MODULE_AUTHOR("Mathieu Desnoyers");
 MODULE_DESCRIPTION("Linux Trace Toolkit Perf Support");
+MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
+       __stringify(LTTNG_MODULES_MINOR_VERSION) "."
+       __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
+       LTTNG_MODULES_EXTRAVERSION);