X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=blobdiff_plain;f=lttng-context-perf-counters.c;h=260e5d0d9a5873cef635b93bbc93548d70104a46;hp=843cda6ef907d6e266dd7f4f047cdbd3fdd9125b;hb=ea15538d675ad5685c1e4ce1c393f25f682eb06b;hpb=1e36732678d7cc650940b4508031acf2f6ffcd1b

diff --git a/lttng-context-perf-counters.c b/lttng-context-perf-counters.c
index 843cda6e..260e5d0d 100644
--- a/lttng-context-perf-counters.c
+++ b/lttng-context-perf-counters.c
@@ -119,7 +119,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);
-	kfree(events);
+	lttng_kvfree(events);
 	kfree(field->u.perf_counter);
 }
 
@@ -237,7 +237,7 @@ int lttng_add_perf_counter_to_ctx(uint32_t type,
 	int ret;
 	char *name_alloc;
 
-	events = kzalloc(num_possible_cpus() * sizeof(*events), GFP_KERNEL);
+	events = lttng_kvzalloc(num_possible_cpus() * sizeof(*events), GFP_KERNEL);
 	if (!events)
 		return -ENOMEM;
 
@@ -350,14 +350,18 @@ cpuhp_prepare_error:
 #else	/* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
 counter_busy:
 counter_error:
-	for_each_online_cpu(cpu) {
-		if (events[cpu] && !IS_ERR(events[cpu]))
-			perf_event_release_kernel(events[cpu]);
-	}
-	put_online_cpus();
+	{
+		int cpu;
+
+		for_each_online_cpu(cpu) {
+			if (events[cpu] && !IS_ERR(events[cpu]))
+				perf_event_release_kernel(events[cpu]);
+		}
+		put_online_cpus();
 #ifdef CONFIG_HOTPLUG_CPU
-	unregister_cpu_notifier(&perf_field->nb);
+		unregister_cpu_notifier(&perf_field->nb);
 #endif
+	}
 #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
 find_error:
 	lttng_remove_context_field(ctx, field);
@@ -368,6 +372,6 @@ name_alloc_error:
 error_alloc_perf_field:
 	kfree(attr);
 error_attr:
-	kfree(events);
+	lttng_kvfree(events);
 	return ret;
 }