Fix: 4.10 hotplug adaptation backward compat

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

diff --git a/lttng-context-perf-counters.c b/lttng-context-perf-counters.c
index 843cda6ef907d6e266dd7f4f047cdbd3fdd9125b..8afc11f89019a9aea251c8b68cb2f39aa47b00da 100644 (file)
--- a/lttng-context-perf-counters.c
+++ b/lttng-context-perf-counters.c
@@ -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);