From mboxrd@z Thu Jan  1 00:00:00 1970
From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Date: Tue, 30 May 2017 14:58:30 +0000 (UTC)
Subject: [lttng-dev] [PATCH lttng-modules] Fix: Build ftrace probe on
 kernels prior to 4.12
In-Reply-To: <1496151391-26076-1-git-send-email-francis.deslauriers@efficios.com>
References: <1496151391-26076-1-git-send-email-francis.deslauriers@efficios.com>
Message-ID: <1657654750.1443.1496156310853.JavaMail.zimbra@efficios.com>

Merged in master, 2.10, 2.9, 2.8, thanks!

Mathieu

----- On May 30, 2017, at 9:36 AM, Francis Deslauriers francis.deslauriers at efficios.com wrote:

> Signed-off-by: Francis Deslauriers <francis.deslauriers at efficios.com>
> ---
> probes/Kbuild | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/probes/Kbuild b/probes/Kbuild
> index fe869d0..78bf3fb 100644
> --- a/probes/Kbuild
> +++ b/probes/Kbuild
> @@ -267,8 +267,9 @@ ifneq ($(CONFIG_DYNAMIC_FTRACE),)
>         echo "warn" ; \
>         exit ; \
>       fi; \
> -      echo "lttng-ftrace.o" ; \
> -    fi;)
> +    fi; \
> +    echo "lttng-ftrace.o" ; \
> +    )
>   ifeq ($(ftrace),warn)
>     $(warning Files $(ftrace_dep) not found. Probe "ftrace" is disabled. Use full
>     kernel source tree to enable it.)
>     ftrace =
> --
> 2.7.4

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com