X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=probes%2FKbuild;h=cc1c0656e4ad2a7556aab9fac1fe87c65bc800aa;hb=7e80ef439f4e2447734c9e924c28530baee70daa;hp=78bf3fb229380cfbb8d6b06e73ea46f67b946b71;hpb=c45ab2e4da171db62a0c963ad3c8e8be6643bc1d;p=lttng-modules.git diff --git a/probes/Kbuild b/probes/Kbuild index 78bf3fb2..cc1c0656 100644 --- a/probes/Kbuild +++ b/probes/Kbuild @@ -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