X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=probes%2FKbuild;h=7a0b6507336a0485e514d60242eb849ed91f5964;hb=4d0e0310925957fc042dc65d8f109d56fed2c4ab;hp=2f6c7c76828681cb6795354f4e084f9e3c6e75a2;hpb=bde63753668a9ad61a64046275297450c5b3e8ee;p=lttng-modules.git

diff --git a/probes/Kbuild b/probes/Kbuild
index 2f6c7c76..7a0b6507 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)
 
@@ -12,6 +12,13 @@ obj-$(CONFIG_LTTNG) += lttng-probe-module.o
 obj-$(CONFIG_LTTNG) += lttng-probe-power.o
 obj-$(CONFIG_LTTNG) += lttng-probe-statedump.o
 
+ifneq ($(CONFIG_NET_9P),)
+  obj-$(CONFIG_LTTNG) +=  $(shell \
+    if [ $(VERSION) -ge 4 \
+      -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 10 \) ] ; then \
+      echo "lttng-probe-9p.o" ; fi;)
+endif # CONFIG_NET_9P
+
 i2c_dep = $(srctree)/include/trace/events/i2c.h
 ifneq ($(wildcard $(i2c_dep)),)
   obj-$(CONFIG_LTTNG) += lttng-probe-i2c.o
@@ -259,7 +266,15 @@ ifneq ($(CONFIG_KRETPROBES),)
 endif # CONFIG_KRETPROBES
 
 ifneq ($(CONFIG_DYNAMIC_FTRACE),)
-  obj-$(CONFIG_LTTNG) += lttng-ftrace.o
+  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.)
+  endif
 endif # CONFIG_DYNAMIC_FTRACE
 
+ifneq ($(CONFIG_PREEMPTIRQ_EVENTS),)
+  obj-$(CONFIG_LTTNG) += lttng-probe-preemptirq.o
+endif # CONFIG_PREEMPTIRQ_EVENTS
+
 # vim:syntax=make