X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context-perf-counters.c;h=8625842cd171158aba762061fbca4853c8e7a9f7;hb=a865837a7cac3e1a35907d9b216caf2eb1c7c00c;hp=03de7b428e6b12658b437e01ef3132baa88fe329;hpb=b7cdc18250880cc44edeef4a4b42c8ac7a135a6d;p=lttng-modules.git

diff --git a/lttng-context-perf-counters.c b/lttng-context-perf-counters.c
index 03de7b42..8625842c 100644
--- a/lttng-context-perf-counters.c
+++ b/lttng-context-perf-counters.c
@@ -13,9 +13,9 @@
 #include <linux/list.h>
 #include <linux/string.h>
 #include <linux/cpu.h>
+#include <linux/mm.h>
 #include <lttng-events.h>
 #include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/vmalloc.h>
 #include <wrapper/perf.h>
 #include <lttng-tracer.h>
 
@@ -106,7 +106,7 @@ void lttng_destroy_perf_counter_field(struct lttng_ctx_field *field)
 #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
 	kfree(field->event_field.name);
 	kfree(field->u.perf_counter->attr);
-	lttng_kvfree(events);
+	kvfree(events);
 	kfree(field->u.perf_counter);
 }
 
@@ -224,7 +224,7 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
 	int ret;
 	char *name_alloc;
 
-	events = lttng_kvzalloc(num_possible_cpus() * sizeof(*events), GFP_KERNEL);
+	events = kvzalloc(num_possible_cpus() * sizeof(*events), GFP_KERNEL);
 	if (!events)
 		return -ENOMEM;
 
@@ -310,18 +310,17 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
 
 	field->event_field.name = name_alloc;
 	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 = 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;
+	field->event_field.type.u.integer.size = sizeof(uint64_t) * CHAR_BIT;
+	field->event_field.type.u.integer.alignment = lttng_alignof(uint64_t) * CHAR_BIT;
+	field->event_field.type.u.integer.signedness = lttng_is_signed_type(uint64_t);
+	field->event_field.type.u.integer.reverse_byte_order = 0;
+	field->event_field.type.u.integer.base = 10;
+	field->event_field.type.u.integer.encoding = lttng_encode_none;
 	field->get_size = perf_counter_get_size;
 	field->record = perf_counter_record;
 	field->u.perf_counter = perf_field;
 	lttng_context_update(*ctx);
 
-	wrapper_vmalloc_sync_all();
 	return 0;
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
@@ -359,6 +358,6 @@ name_alloc_error:
 error_alloc_perf_field:
 	kfree(attr);
 error_attr:
-	lttng_kvfree(events);
+	kvfree(events);
 	return ret;
 }