diff mbox

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

Message ID 1496151391-26076-1-git-send-email-francis.deslauriers@efficios.com
State Accepted, archived
Headers show

Commit Message

Francis Deslauriers May 30, 2017, 1:36 p.m. UTC 
Signed-off-by: Francis Deslauriers <francis.deslauriers at efficios.com>
---
 probes/Kbuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Mathieu Desnoyers May 30, 2017, 2:58 p.m. UTC | #1 
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
diff mbox

Patch

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 =