From 0d4e2d786931f5ab7a7c1ed8487a1aea24890ba9 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 13 Apr 2020 17:06:04 -0400 Subject: [PATCH] lib ring buffer frontend_types.h: remove cpu hotplug compatibility code --- lib/ringbuffer/frontend_types.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/ringbuffer/frontend_types.h b/lib/ringbuffer/frontend_types.h index 3fd63452..b9804165 100644 --- a/lib/ringbuffer/frontend_types.h +++ b/lib/ringbuffer/frontend_types.h @@ -53,16 +53,9 @@ 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 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 */ -- 2.34.1