X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lib%2Fringbuffer%2Ffrontend_types.h;h=50b33ac11c85f70856b8dc4f38810df02d346fe9;hb=1e36732678d7cc650940b4508031acf2f6ffcd1b;hp=346813e9c3ea30ad2eba8e4dc54608b7b974bd45;hpb=ff8bdcc205c3c26b8fd7cbd168d22702350f3b51;p=lttng-modules.git

diff --git a/lib/ringbuffer/frontend_types.h b/lib/ringbuffer/frontend_types.h
index 346813e9..50b33ac1 100644
--- a/lib/ringbuffer/frontend_types.h
+++ b/lib/ringbuffer/frontend_types.h
@@ -33,6 +33,7 @@
 #include <wrapper/ringbuffer/backend_types.h>
 #include <wrapper/spinlock.h>
 #include <lib/prio_heap/lttng_prio_heap.h>	/* For per-CPU read-side iterator */
+#include <lttng-cpuhotplug.h>
 
 /*
  * A switch is done during tracing or as a final flush after tracing (so it
@@ -69,11 +70,17 @@ struct channel {
 
 	unsigned long switch_timer_interval;	/* Buffer flush (jiffies) */
 	unsigned long read_timer_interval;	/* Reader wakeup (jiffies) */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
+	struct lttng_cpuhp_node cpuhp_prepare;
+	struct lttng_cpuhp_node cpuhp_online;
+	struct lttng_cpuhp_node cpuhp_iter_online;
+#else
 	struct notifier_block cpu_hp_notifier;	/* CPU hotplug notifier */
-	struct notifier_block tick_nohz_notifier; /* CPU nohz notifier */
 	struct notifier_block hp_iter_notifier;	/* hotplug iterator notifier */
 	unsigned int cpu_hp_enable:1;		/* Enable CPU hotplug notif. */
 	unsigned int hp_iter_enable:1;		/* Enable hp iter notif. */
+#endif
+	struct notifier_block tick_nohz_notifier; /* CPU nohz notifier */
 	wait_queue_head_t read_wait;		/* reader wait queue */
 	wait_queue_head_t hp_wait;		/* CPU hotplug wait queue */
 	int finalized;				/* Has channel been finalized */