Re: [lttng-dev] [PATCH lttng-modules] Fix: Build ftrace probe on kernels prior to 4.12

2017-05-30 Thread Mathieu Desnoyers
Merged in master, 2.10, 2.9, 2.8, thanks!

Mathieu

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

> Signed-off-by: Francis Deslauriers 
> ---
> 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
___
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev


[lttng-dev] [PATCH lttng-modules] Fix: Build ftrace probe on kernels prior to 4.12

2017-05-30 Thread Francis Deslauriers
Signed-off-by: Francis Deslauriers 
---
 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

___
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev