Merged into master, 2.9, 2.10,
Thanks!
Mathieu
----- On Mar 13, 2018, at 12:14 PM, Michael Jeanson mjean...@efficios.com wrote:
> Signed-off-by: Michael Jeanson <mjean...@efficios.com>
> ---
> lttng-events.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/lttng-events.c b/lttng-events.c
> index 2cd650f..6098ce4 100644
> --- a/lttng-events.c
> +++ b/lttng-events.c
> @@ -2760,7 +2760,7 @@ static void __exit lttng_exit_cpu_hotplug(void)
> cpuhp_remove_multi_state(lttng_hp_prepare);
> }
>
> -#else /* #if (CONFIG_HOTPLUG_CPU && (LINUX_VERSION_CODE >=
> KERNEL_VERSION(4,10,0))) */
> +#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
> static int lttng_init_cpu_hotplug(void)
> {
> return 0;
> @@ -2768,7 +2768,7 @@ static int lttng_init_cpu_hotplug(void)
> static void lttng_exit_cpu_hotplug(void)
> {
> }
> -#endif /* #else #if (CONFIG_HOTPLUG_CPU && (LINUX_VERSION_CODE >=
> KERNEL_VERSION(4,10,0))) */
> +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
>
>
> static int __init lttng_events_init(void)
> --
> 2.7.4
--
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
