X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=probes%2FKbuild;h=70a3d8689438793b6f0bb92aa65d03c1c6bd8eda;hb=e8c9b24610060c36a2c6e25055810d1df8243707;hp=78bf3fb229380cfbb8d6b06e73ea46f67b946b71;hpb=bc1fb1b8c9fe9170a540ef5e8e4ba4e10fd02019;p=lttng-modules.git

diff --git a/probes/Kbuild b/probes/Kbuild
index 78bf3fb2..70a3d868 100644
--- a/probes/Kbuild
+++ b/probes/Kbuild
@@ -1,6 +1,6 @@
 TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/..
 
-include $(TOP_LTTNG_MODULES_DIR)/Makefile.ABI.workarounds
+include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common
 
 ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)
 
@@ -259,22 +259,11 @@ ifneq ($(CONFIG_KRETPROBES),)
 endif # CONFIG_KRETPROBES
 
 ifneq ($(CONFIG_DYNAMIC_FTRACE),)
-  ftrace_dep = $(srctree)/kernel/trace/trace.h
-  ftrace_dep_check = $(wildcard $(ftrace_dep))
-  ftrace = $(shell \
-    if [ $(VERSION) -ge 5 -o \( $(VERSION) -eq 4 -a $(PATCHLEVEL) -ge 12 \) ] ; then \
-      if [ -z "$(ftrace_dep_check)" ] ; then \
-        echo "warn" ; \
-        exit ; \
-      fi; \
-    fi; \
-    echo "lttng-ftrace.o" ; \
-    )
-  ifeq ($(ftrace),warn)
+  ifeq ($(have_ftrace_header),yes)
+    obj-$(CONFIG_LTTNG) += lttng-ftrace.o
+  else
     $(warning Files $(ftrace_dep) not found. Probe "ftrace" is disabled. Use full kernel source tree to enable it.)
-    ftrace =
-  endif # $(ftrace),warn
-  obj-$(CONFIG_LTTNG) += $(ftrace)
+  endif
 endif # CONFIG_DYNAMIC_FTRACE
 
 # vim:syntax=make