From: Lars Persson Date: Sun, 11 Mar 2018 14:02:43 +0000 (+0100) Subject: Fix: do not use CONFIG_HOTPLUG_CPU for the new hotplug API X-Git-Tag: v2.11.0-rc1~60 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=894ce5dc825733d1ccab25b1aede9ce0be2a7c4e;p=lttng-modules.git Fix: do not use CONFIG_HOTPLUG_CPU for the new hotplug API Kernel configurations without CONFIG_HOTPLUG_CPU throw an unknown symbol error when attempting to insert the lttng-trace module: lttng_tracer: Unknown symbol lttng_hp_prepare (err 0) lttng_tracer: Unknown symbol lttng_hp_online (err 0) This was caused by lttng-events and lttng-context-perf-counter not agreeing on which preprocessor condition that should guard the use of the hotplug API. In fact the API is available also on kernels built without CONFIG_HOTPLUG_CPU. Signed-off-by: Lars Persson Signed-off-by: Mathieu Desnoyers --- diff --git a/lttng-events.c b/lttng-events.c index 6f122dd7..2cd650fd 100644 --- a/lttng-events.c +++ b/lttng-events.c @@ -2644,7 +2644,7 @@ void lttng_transport_unregister(struct lttng_transport *transport) } EXPORT_SYMBOL_GPL(lttng_transport_unregister); -#if (defined(CONFIG_HOTPLUG_CPU) && (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) enum cpuhp_state lttng_hp_prepare; enum cpuhp_state lttng_hp_online;